Use correct naming store for all operations