correct some naming errors