Revert "fixed naming conventions"

This reverts commit 5ebdfc9dff1afaa480a46e9512760e58558f739f.