There was a merge issue with some naming conventions due to a previous merge...

There was a merge issue with some naming conventions due to a previous merge fail when we both worked on the same thing. It's fixed now