Nomenclature Module and Refactoring