Using the proper Type/Feature naming in the classes