fix naming problems when adding modules in custom transforms
Merge branch 'master' into literalwidths