cleaning up some naming.