Refactored related classes to capital letters