Updated template code to use generic names.