Cleaned up code name to remove embedded hierarchy.