Fixing domain name
Fixing template check
Fixing name assignment in template