Fixing a bunch of naming conventions

Fixing a bunch of naming conventions