[NUCRDBMS-803] Refactor DatastoreIdentifier.getIdentifierName to
getName. Some other minor cleanups