Fix and Update Endpoints type names