maq - refactoring: renaming.