Renaming and bug trapping