Renamed ServiceName and DisplayName defaults