new naming rules for translations
resolve conflict