More rename-related fun.