Refactored naming of classes