Renamed services, minor tweaks