modified datastores names function