Renaming z

Apparently some of these renames were missed.