Revert "better naming convention"

This reverts commit c837975932a4bd5d5f5f9b12fa575a91aa5f6d3a.