Naming System Changes

Patches to work for new build