Support for hostname templates and updated naming

Change-Id: I1d46a456fdecaecaf873b31012d9178e75f37711