Don't update unit name if exists. Also use unit name in sync.