Fix template name extraction. Add keyword addition
Fix template name extraction. Add keyword addition

hdeshev/NativeScript,genexliu/NativeScript,genexliu/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,hdeshev/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,hdeshev/NativeScript,genexliu/NativeScript