Wide Ranging change to naming conventions to make plugin code easier and
simplify choices end users.
more changes to item names