Refactored classes to to have the correct names