fix some naming for clarity