Changes for Party CamelCase status and enum changes and other cleanups; POPC specific cleanups too