making naming better

sorry for tiny silly commits, developing in two places at once