Fixing a bug with renaming. I think it's good now.