simplify data store class name