Name change and other updates to the security box.
Merge origin/master