Update naming schema