Refactoring class names related to single objective gas