diff --git a/projects/player/src/app/components/floating-keypad/floating-keypad.component.html b/projects/player/src/app/components/floating-keypad/floating-keypad.component.html
index 01f63c2a68cd7794c2b4be9f7eaeab7bd698c664..8485f7d5bc756d07fc21996c275cc17c18ec3744 100644
--- a/projects/player/src/app/components/floating-keypad/floating-keypad.component.html
+++ b/projects/player/src/app/components/floating-keypad/floating-keypad.component.html
@@ -10,7 +10,7 @@
       [position]="keypadService.position"
       [preset]="keypadService.preset"
       [restrictToAllowedKeys]="keypadService.elementComponent.elementModel.restrictedToInputAssistanceChars"
-      (deleteCharacter)="keypadService.deleterCharacters(true)"
-      (enterKey)="keypadService.enterKey($event)">
+      (backSpaceClicked)="keypadService.deleterCharacters(true)"
+      (keyClicked)="keypadService.enterKey($event)">
   </aspect-keypad>
 </ng-template>
diff --git a/projects/player/src/app/components/keypad-french/keypad-french.component.html b/projects/player/src/app/components/keypad-french/keypad-french.component.html
index 2d6dafd5c4f614b2be59bf9972f2aaa133d4af6c..898ad7d7cd6e30e54cdc5a35af88e635054635b5 100644
--- a/projects/player/src/app/components/keypad-french/keypad-french.component.html
+++ b/projects/player/src/app/components/keypad-french/keypad-french.component.html
@@ -5,7 +5,7 @@
           [key]="key"
           [position]="position"
           [last]="lastRowKey"
-          (enterKey)="enterKey.emit($event)">
+          (keyClicked)="keyClicked.emit($event)">
       </aspect-keypad-key>
     </ng-container>
   </div>
@@ -15,9 +15,9 @@
         class="keypad-capslock"
         mat-mini-fab
         [class.fixed-keypad-key]="position === 'right'"
-        (click)="toggleCharacterCase()">
-      <mat-icon *ngIf="lowerCharacters">keyboard_arrow_up</mat-icon>
-      <mat-icon *ngIf="!lowerCharacters">keyboard_capslock</mat-icon>
+        (click)="toggleShift()">
+      <mat-icon *ngIf="!shift">keyboard_arrow_up</mat-icon>
+      <mat-icon *ngIf="shift">keyboard_capslock</mat-icon>
     </button>
   </div>
 </div>
diff --git a/projects/player/src/app/components/keypad-french/keypad-french.component.ts b/projects/player/src/app/components/keypad-french/keypad-french.component.ts
index 2a27c24135679241e0ee86f0d2d0877faea872af..7df24c036e362946bb964a2d2090156c776b1f09 100644
--- a/projects/player/src/app/components/keypad-french/keypad-french.component.ts
+++ b/projects/player/src/app/components/keypad-french/keypad-french.component.ts
@@ -11,19 +11,19 @@ import { KeyLayout } from '../../configs/key-layout';
 })
 export class KeypadFrenchComponent extends KeyboardInputRestrictionDirective implements OnInit {
   @Input() position!: 'floating' | 'right';
-  @Output() enterKey = new EventEmitter<string>();
+  @Output() keyClicked = new EventEmitter<string>();
 
   rows!: string[][];
-  lowerCharacters!: boolean;
+  shift!: boolean;
 
   ngOnInit(): void {
     this.allowedKeys = [...KeyLayout.get('french').default.flat(), ...KeyLayout.get('french').shift.flat()];
-    this.toggleCharacterCase();
+    this.rows = KeyLayout.get('french').default;
   }
 
-  toggleCharacterCase(): void {
-    this.lowerCharacters = !this.lowerCharacters;
-    if (this.lowerCharacters) {
+  toggleShift(): void {
+    this.shift = !this.shift;
+    if (this.shift) {
       this.rows = KeyLayout.get('french').shift;
     } else {
       this.rows = KeyLayout.get('french').default;
diff --git a/projects/player/src/app/components/keypad-key/keypad-key.component.html b/projects/player/src/app/components/keypad-key/keypad-key.component.html
index ab75e67ac7336d9960b5d69fd8ee83036eac465b..db6fcffb440d818f0d613f983af01c7de3148ecd 100644
--- a/projects/player/src/app/components/keypad-key/keypad-key.component.html
+++ b/projects/player/src/app/components/keypad-key/keypad-key.component.html
@@ -7,5 +7,5 @@
     [class.not-last-key]="!last"
     [class.oval-floating-keypad-key]="oval && position === 'floating'"
     [class.oval-fixed-keypad-key]="oval && position !== 'floating'"
-    (click)="enterKey.emit(key);">{{key}}
+    (click)="keyClicked.emit(key);">{{key}}
 </button>
diff --git a/projects/player/src/app/components/keypad-key/keypad-key.component.ts b/projects/player/src/app/components/keypad-key/keypad-key.component.ts
index e4c7214170bd7d530449e602b5b44f193b057994..223fe2128d971bedc43dba094d91dcd0b34201c0 100644
--- a/projects/player/src/app/components/keypad-key/keypad-key.component.ts
+++ b/projects/player/src/app/components/keypad-key/keypad-key.component.ts
@@ -15,5 +15,5 @@ export class KeypadKeyComponent {
   @Input() last!: boolean;
   @Input() preset!: InputAssistancePreset;
 
-  @Output() enterKey = new EventEmitter<string>();
+  @Output() keyClicked = new EventEmitter<string>();
 }
diff --git a/projects/player/src/app/components/keypad-math/keypad-math.component.html b/projects/player/src/app/components/keypad-math/keypad-math.component.html
index 2653b32248fce1c91a2dd48608316b1d7271125d..3c26a227ac909a4d66c511ef36af139b26e5b650 100644
--- a/projects/player/src/app/components/keypad-math/keypad-math.component.html
+++ b/projects/player/src/app/components/keypad-math/keypad-math.component.html
@@ -1,11 +1,11 @@
-<div *ngFor="let row of mainKeys; let last = last">
+<div *ngFor="let row of rows; let last = last">
   <ng-container *ngFor="let key of row; let lastRowKey = last">
     <aspect-keypad-key
         [key]="key"
         [preset]="preset"
         [last]="!last && lastRowKey"
         [position]="position"
-        (enterKey)="enterKey.emit($event)">
+        (keyClicked)="keyClicked.emit($event)">
     </aspect-keypad-key>
     <span *ngIf="last && lastRowKey"
           [class.clear-button-container-floating-keypad]="(
@@ -17,7 +17,7 @@
       <button type="button"
               mat-mini-fab
               [class]="position === 'floating' ? 'delete-characters-floating-keypad' : 'delete-characters-fixed-keypad'"
-              (click)="deleteCharacter.emit()">
+              (click)="backSpaceClicked.emit()">
         <mat-icon>keyboard_backspace</mat-icon>
       </button>
     </span>
@@ -30,7 +30,7 @@
      [class.floating-2-column-grid-layout]="position === 'floating' && preset === 'numbersAndBasicOperators'"
      [class.fixed-3-column-grid-layout]="position !== 'floating' && preset === 'numbersAndOperators'"
      [class.fixed-2-column-grid-layout]="position !== 'floating' && preset === 'numbersAndBasicOperators'">
-  <ng-container *ngFor="let row of operators; let rowIndex = index ">
+  <ng-container *ngFor="let row of additionalRows; let rowIndex = index ">
     <ng-container *ngFor="let key of row; let columnIndex = index">
       <aspect-keypad-key *ngIf="key !== '='"
                   [key]="key"
@@ -39,7 +39,7 @@
                   [style.grid-column-end]="columnIndex+2"
                   [style.grid-row-start]="rowIndex + 1"
                   [style.grid-row-end]="rowIndex + 2"
-                  (enterKey)="enterKey.emit($event)">
+                  (keyClicked)="keyClicked.emit($event)">
       </aspect-keypad-key>
         <ng-container *ngIf="preset === 'numbersAndOperators'">
           <aspect-keypad-key *ngIf="key === '='"
@@ -50,7 +50,7 @@
                       [style.grid-column-end]="3"
                       [style.grid-row-start]="1"
                       [style.grid-row-end]="3"
-                      (enterKey)="enterKey.emit($event)">
+                      (keyClicked)="keyClicked.emit($event)">
           </aspect-keypad-key>
         </ng-container>
       </ng-container>
diff --git a/projects/player/src/app/components/keypad-math/keypad-math.component.ts b/projects/player/src/app/components/keypad-math/keypad-math.component.ts
index 5f438acdfb1dcbbf8c8d6a5a83d880e43c4bc623..5b8e84a6c203c2eeead699d98aed0dba0ea72489 100644
--- a/projects/player/src/app/components/keypad-math/keypad-math.component.ts
+++ b/projects/player/src/app/components/keypad-math/keypad-math.component.ts
@@ -14,15 +14,15 @@ export class KeypadMathComponent extends KeyboardInputRestrictionDirective imple
   @Input() preset!: InputAssistancePreset;
   @Input() position!: 'floating' | 'right';
 
-  @Output() deleteCharacter = new EventEmitter();
-  @Output() enterKey = new EventEmitter<string>();
+  @Output() backSpaceClicked = new EventEmitter();
+  @Output() keyClicked = new EventEmitter<string>();
 
-  mainKeys!: string[][];
-  operators!: string[][];
+  rows!: string[][];
+  additionalRows!: string[][];
 
   ngOnInit(): void {
-    this.mainKeys = KeyLayout.get(this.preset).default;
-    this.operators = KeyLayout.get(this.preset).additional;
-    this.allowedKeys = [...this.mainKeys.flat(), ...this.operators.flat()];
+    this.rows = KeyLayout.get(this.preset).default;
+    this.additionalRows = KeyLayout.get(this.preset).additional;
+    this.allowedKeys = [...this.rows.flat(), ...this.additionalRows.flat()];
   }
 }
diff --git a/projects/player/src/app/components/keypad/keypad.component.html b/projects/player/src/app/components/keypad/keypad.component.html
index 9d14a3c96d74041a8a2b37caeeaf52161c14dffc..62f5136000ac47f2ee6180f58872dfaae3155162 100644
--- a/projects/player/src/app/components/keypad/keypad.component.html
+++ b/projects/player/src/app/components/keypad/keypad.component.html
@@ -12,7 +12,7 @@
         [inputElement]="inputElement"
         [restrictToAllowedKeys]="restrictToAllowedKeys"
         [position]="position"
-        (enterKey)="enterKey.emit($event)">
+        (keyClicked)="keyClicked.emit($event)">
     </aspect-keypad-french>
     <aspect-keypad-math
         *ngIf="preset !== 'french'"
@@ -20,8 +20,8 @@
         [preset]="preset"
         [position]="position"
         [restrictToAllowedKeys]="restrictToAllowedKeys"
-        (deleteCharacter)="deleteCharacter.emit()"
-        (enterKey)="enterKey.emit($event)">
+        (backSpaceClicked)="backSpaceClicked.emit()"
+        (keyClicked)="keyClicked.emit($event)">
     </aspect-keypad-math>
   </div>
 </div>
diff --git a/projects/player/src/app/components/keypad/keypad.component.ts b/projects/player/src/app/components/keypad/keypad.component.ts
index 4418eac971dd53f6db987b1b736108af8dec0f97..d806ce5212fe984401ed9260f7b91dd12595e234 100644
--- a/projects/player/src/app/components/keypad/keypad.component.ts
+++ b/projects/player/src/app/components/keypad/keypad.component.ts
@@ -15,6 +15,6 @@ export class KeypadComponent {
   @Input() positionOffset!: number;
   @Input() restrictToAllowedKeys!: boolean;
 
-  @Output() deleteCharacter = new EventEmitter();
-  @Output() enterKey = new EventEmitter<string>();
+  @Output() backSpaceClicked = new EventEmitter();
+  @Output() keyClicked = new EventEmitter<string>();
 }
diff --git a/projects/player/src/app/components/layout-player/layout-player.component.html b/projects/player/src/app/components/layout-player/layout-player.component.html
index 4b2fc89366bd19ec7a3deab7dc9e95b4a520443a..5961fba4c1f992eca20631a8c4c068c38ea32349 100644
--- a/projects/player/src/app/components/layout-player/layout-player.component.html
+++ b/projects/player/src/app/components/layout-player/layout-player.component.html
@@ -11,8 +11,8 @@
         [position]="keypadService.position"
         [preset]="keypadService.preset"
         [restrictToAllowedKeys]="keypadService.elementComponent.elementModel.restrictedToInputAssistanceChars"
-        (deleteCharacter)="keypadService.deleterCharacters(true)"
-        (enterKey)="keypadService.enterKey($event)">
+        (backSpaceClicked)="keypadService.deleterCharacters(true)"
+        (keyClicked)="keypadService.enterKey($event)">
     </aspect-keypad>
   </div>
   <aspect-keyboard
diff --git a/projects/player/src/app/configs/key-layout.ts b/projects/player/src/app/configs/key-layout.ts
index 9cbc84d9398864889f0dea88e8ce4ae7454e8772..2adbedcf9c2a163dd9634f6d37e87f9373b0d46a 100644
--- a/projects/player/src/app/configs/key-layout.ts
+++ b/projects/player/src/app/configs/key-layout.ts
@@ -6,13 +6,13 @@ export class KeyLayout {
       case 'french': {
         return {
           default: [
-            ['Â', 'À', 'Æ', 'Ê', 'È', 'É', 'Ë', 'Î'],
-            ['Ï', 'Ô', 'Ò', 'Œ', 'Û', 'Ù', 'Ü', 'Ç']
-          ],
-          shift: [
             ['â', 'à', 'æ', 'ê', 'è', 'é', 'ë', 'î'],
             ['ï', 'ô', 'ò', 'œ', 'û', 'ù', 'ü', 'ç']
           ],
+          shift: [
+            ['Â', 'À', 'Æ', 'Ê', 'È', 'É', 'Ë', 'Î'],
+            ['Ï', 'Ô', 'Ò', 'Œ', 'Û', 'Ù', 'Ü', 'Ç']
+          ],
           additional: [[]]
         };
       }