Revert "Naming Cleanup"

This reverts commit 85f7b880d5d3fc5aea28e2ecbde85e1dcb345016.