Cleaned up some files for naming conventions.