Fix bugs from renaming things