Revert "Better naming conventions for methods"

This reverts commit 6867dd543e8feb30799fcc24a7a03bb339ad6307.