Code Sniffer Fixes ( Class Naming )