Update Naming Scheme