OGM-543 Providing constants with datastore short names