2.2 Name Changes

Some additions and changes.
Prep for some big changes coming in 2.3.
TC Carr:}
Webmaster