Cleaned up some naming issues and marked others to be fixed after merging