Revert "More like z name"

This reverts commit 98cb1f1698d44a03b1aa59a99d690899b4772044.