Bug fix to last commit: didn't rename uniformly