Cleaned up some files with capitalization issues
premerge