Modularization of fixNames.