Renamed some items to be less verbose