correct some naming