fix model domains to valid names

Change-Id: Ia89d35ffb204401ac05c11ac877a9a3b69e56745
14 files changed