Class Renaming to suit Java Standards
Class Renaming to suit Java Standards