Revert "Revert "Naming Cleanup""

This reverts commit 9a16f51c2ea3b81ddfe72ea8b2866db1754e5ed3.