improving some naming