refactored naming convention of component classes