Fix name collision in template sync (OMS-507)