Standardized most of my naming conventions.