Revert "Change naming"

This reverts commit 4d44778cab2609f4195f2c0df7033cf851879b70.