Merge Dev testing + Prod naming scheme
Disable help items for now