Fix code convention for classes and methods