some naming suggestions

don't want to actually merge this, it is strictly for discussion purposes