Naming Scheme updates