Update naming strategy