[PATCH 0/6] Fix direct renaming of hashed controls