Renaming Endpoint to be unambiguous
Disambiguating RDS endpoint