continuing to make terminology and style more consistent
continuing to make terminology and style more consistent

asmodehn/catkin,harmishhk/catkin,scpeters/catkin,jack-oquin/catkin,harmishhk/catkin,meyerj/catkin,beni55/catkin,thaddeustaylor/catkin,asmodehn/catkin,beni55/catkin,wkentaro/catkin,shyamalschandra/catkin,ros/catkin,ros/catkin,wkentaro/catkin,shyamalschandra/catkin,asmodehn/catkin,meyerj/catkin,thaddeustaylor/catkin,jack-oquin/catkin,meyerj/catkin,thaddeustaylor/catkin,wkentaro/catkin,shyamalschandra/catkin,ros/catkin,scpeters/catkin,scpeters/catkin,beni55/catkin,jack-oquin/catkin,harmishhk/catkin