Fixed: Now avoids renaming the non-encoded routine names.