SEBA-389 Prevent model name collision

Change-Id: Ice19a662d50ec0cd636dfd6d9b92b7e75cc11ee9
2 files changed