DebugMatStore cleanup
renaming