refactor into a new naming schema to more easily differenciate the class types