refactoring out the measure/module names