Support for hostname templates and updated naming

Change-Id: Ibec205826dc4ee2c0f84cdc9ff4d4c6880449f70