Moving section names to model, to avoid an unnecessary hashmap

Change-Id: I9620367e0c2203b2290a4a188411ccb9174ae130
4 files changed