Renamed internal classes/traits