some naming updates
merge conflicts