Updated Classname, spelling and method names to be more consistant