some naming, small changes