Change 15901

Matt Attaway
Clean up code to fit modern Workshop naming standards
0+ edited 244+ added 756+ deleted