Clean up some naming conventions.