renamed file and class to follow convention