Some Clean Up
Naming Errors Fixed
Fixing merge conflicts