Adjusted classes to the naming conventions.