Renamed to the more suitable name for the future extensding.