added quotes to templates

Addition of quotes to templates permits the use of special characters
and numbers in entity names.