Renamed internal names