Change 15897

Matt Attaway
Pull changes after the rename in from Paul's dev branch so code will go back smoothly
4 edited 3 added 4 deleted
Tip: Use n and p to cycle through the changes.