cleaned up some naming