Added workflow namespacing to all JSON internal workflow constants
Conditional statement cleanup