Merge "Correct namespace 'Template' for gom-deva"