Cleanup
Minor renaming of endpoints to replicaset