Refactoring: Name constructor when generating code