Renamed class NamespaceMask

- NamespaceMask renamend to VariableMasks
- also instances renamed