diff --git a/src/components/svg-keyboard.component.ts b/src/components/svg-keyboard.component.ts
index 87c7c149..19ea22e3 100644
--- a/src/components/svg-keyboard.component.ts
+++ b/src/components/svg-keyboard.component.ts
@@ -13,7 +13,7 @@ import {UhkConfiguration} from '../../config-serializer/config-items/UhkConfigur
     `
         <svg xmlns="http://www.w3.org/2000/svg" [attr.viewBox]="viewBox" height="100%" width="100%">
             <svg:g [attr.transform]="transform" [attr.fill]="fill">
-                <svg:g svg-module *ngFor="#module of modules; #i = index"
+                <svg:g svg-module *ngFor="let module of modules; let i = index"
                         [coverages]="module.coverages"
                         [keyboardKeys]="module.keyboardKeys"
                         [attr.transform]="module.attributes.transform"
diff --git a/src/components/svg-module.component.ts b/src/components/svg-module.component.ts
index 7092a2f7..04e4d168 100644
--- a/src/components/svg-module.component.ts
+++ b/src/components/svg-module.component.ts
@@ -10,8 +10,8 @@ import {Mapper} from '../utils/mapper';
     selector: 'g[svg-module]',
     template:
     `
-        <svg:path *ngFor="#path of coverages" [attr.d]="path.$.d"/>
-        <svg:g svg-keyboard-key *ngFor="#key of keyboardKeys; #i = index"
+        <svg:path *ngFor="let path of coverages" [attr.d]="path.$.d"/>
+        <svg:g svg-keyboard-key *ngFor="let key of keyboardKeys; let i = index"
                 [id]="key.id"
                 [rx]="key.rx" [ry]="key.ry"
                 [width]="key.width" [height]="key.height"