Stronger OOP
OOP and nomenclature refactoring