modified end point names to comply with the naming convention