Revert "Revert naming (sorry)"

This reverts commit 1d56ecd985978e4488f723d47f9021db357c8e07.