Clean up some naming.