Align model with cc teamplate

And fix geine definition

Change-Id: Ifa4d586de6fca643d9e9b04f58ea6432bd30c687
Closes-PROD: PROD-26120
6 files changed