Finish up prior renaming changes
TEMP SAUCE LABS ON TRASK/GLOWROOT