Fixing DefinedConstant renaming issues