Refactored generation of collection scope to be re-used with CpNamingUtils for consistency
Refactored generation of collection scope to be re-usable with CpNamingUtils for consistency across modules
Finished migration testing.  All core tests pass.