Renamed Flavors to FlavorTemplates where appropriate

Fixes: bug #1211465

Change-Id: I0908b8f2c954e5cf27441a9d4bec9ac03de937cd