fixed coding standard update

missed a couple of name changes and removed/commented out several
diagnostic Toasts