Renamed Configuration entity to Remote
Fixed remaining issues caused by rename