B-58092 cleaning up methods, method and parameter names in DatastoreService and users of the service