diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 40aecafd2b00fa62734db3a9686139e6c17845fc..55e65a525fb0a82a9b14e712ba4ed7397376afbc 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -4,14 +4,14 @@ import { Router, Event, NavigationEnd, ActivationEnd } from "@angular/router";
 import { Observer, jalhydDateRev } from "jalhyd";
 
 import { environment } from "../environments/environment";
-import { InternationalisationService } from "./services/internationalisation/internationalisation.service";
+import { I18nService } from "./services/internationalisation/internationalisation.service";
 import { ErrorService } from "./services/error/error.service";
 import { FormulaireService } from "./services/formulaire/formulaire.service";
 import { FormulaireDefinition } from "./formulaire/definition/form-definition";
 import { ServiceFactory } from "./services/service-factory";
 import { ParamService } from "./services/param/param.service";
-import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
 import { HttpService } from "./services/http/http.service";
+import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
 import { nghydDateRev } from "../date_revision";
 
 import { MatSidenav, MatToolbar, MatDialog } from "@angular/material";
@@ -59,7 +59,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
   private _routerCurrentComponent: Component;
 
   constructor(
-    private intlService: InternationalisationService,
+    private intlService: I18nService,
     private paramService: ParamService,
     private appSetupService: ApplicationSetupService,
     private appRef: ApplicationRef,
@@ -71,11 +71,11 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
     private saveSessionDialog: MatDialog,
     private loadSessionDialog: MatDialog
   ) {
+    ServiceFactory.instance.httpService = httpService;
     ServiceFactory.instance.applicationSetupService = appSetupService;
     ServiceFactory.instance.paramService = paramService;
-    ServiceFactory.instance.internationalisationService = intlService;
+    ServiceFactory.instance.i18nService = intlService;
     ServiceFactory.instance.formulaireService = formulaireService;
-    ServiceFactory.instance.httpService = httpService;
 
     this.router.events.subscribe((event: Event) => {
       // close side navigation when clicking a calculator tab
@@ -251,7 +251,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
           this.closeCalculator(form);
           break;
       }
-    } else if (sender instanceof InternationalisationService) {
+    } else if (sender instanceof I18nService) {
       this.updateLocale();
     } else if (sender instanceof FormulaireDefinition) {
       switch (data["action"]) {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9f2bebe384c8eba9473cf7b5512262a2da869632..0919fdfb23611c79ad6a736ed79872b17b855cca 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,8 +2,21 @@ import { BrowserModule } from "@angular/platform-browser";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 
-import { MatButtonModule, MatCheckboxModule, MatIconModule, MatSelectModule, MatTabsModule, MatSidenavModule,
-  MatToolbarModule, MatMenuModule, MatDialogModule, MatFormFieldModule, MatInputModule, MatListModule } from "@angular/material";
+import {
+  MatButtonModule,
+  MatCheckboxModule,
+  MatIconModule,
+  MatSelectModule,
+  MatTabsModule,
+  MatSidenavModule,
+  MatToolbarModule,
+  MatMenuModule,
+  MatDialogModule,
+  MatFormFieldModule,
+  MatInputModule,
+  MatListModule,
+  MatCardModule
+} from "@angular/material";
 import { MaterialFileInputModule } from "ngx-material-file-input";
 
 import { FlexLayoutModule } from "@angular/flex-layout";
@@ -16,7 +29,7 @@ import { NgxMdModule } from "ngx-md";
 
 import { FormulaireService } from "./services/formulaire/formulaire.service";
 import { ParamService } from "./services/param/param.service";
-import { InternationalisationService } from "./services/internationalisation/internationalisation.service";
+import { I18nService } from "./services/internationalisation/internationalisation.service";
 import { HttpService } from "./services/http/http.service";
 import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
 
@@ -76,6 +89,7 @@ const appRoutes: Routes = [
     HttpClientModule,
     FlexLayoutModule,
     MatButtonModule,
+    MatCardModule,
     MatCheckboxModule,
     MatDialogModule,
     MaterialFileInputModule,
@@ -147,7 +161,7 @@ const appRoutes: Routes = [
     ApplicationSetupService,
     FormulaireService,
     HttpService,
-    InternationalisationService,
+    I18nService,
     ParamService
   ],
   schemas: [ NO_ERRORS_SCHEMA ],
diff --git a/src/app/components/app-setup/app-setup.component.ts b/src/app/components/app-setup/app-setup.component.ts
index 9cafb5ab444f1cdf8721df5a3bbba14f7500115b..01b852d4e403810b1f9203df645ac48fe6d79525 100644
--- a/src/app/components/app-setup/app-setup.component.ts
+++ b/src/app/components/app-setup/app-setup.component.ts
@@ -3,7 +3,7 @@ import { Component, ViewChild, OnInit } from "@angular/core";
 import { ParamDomainValue, Observer } from "jalhyd";
 
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
-import { InternationalisationService, LanguageCode } from "../../services/internationalisation/internationalisation.service";
+import { I18nService, LanguageCode } from "../../services/internationalisation/internationalisation.service";
 import { NgBaseParam, BaseParamInputComponent } from "../base-param-input/base-param-input.component";
 import { BaseComponent } from "../base/base.component";
 
@@ -38,7 +38,7 @@ export class ApplicationSetupComponent extends BaseComponent implements Observer
 
     constructor(
         private appSetupService: ApplicationSetupService,
-        private intlService: InternationalisationService
+        private intlService: I18nService
     ) {
         super();
         this.appSetupService.addObserver(this);
diff --git a/src/app/components/base-param-input/base-param-input.component.ts b/src/app/components/base-param-input/base-param-input.component.ts
index 2a3588fc0a1f882b17b3d5a4579568a1ddd579de..b85fc7abe530b2bcb3cf164867ca4b00e29876a0 100644
--- a/src/app/components/base-param-input/base-param-input.component.ts
+++ b/src/app/components/base-param-input/base-param-input.component.ts
@@ -4,7 +4,7 @@ import { Component, ChangeDetectorRef } from "@angular/core";
 
 import { Message, ParamDefinition, ParamDomain, ParamDomainValue, Observable, isNumeric } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { GenericInputComponent } from "../generic-input/generic-input.component";
 
 export class NgBaseParam extends Observable {
@@ -42,7 +42,7 @@ export class NgBaseParam extends Observable {
     templateUrl: "../generic-input/generic-input.component.html",
 })
 export class BaseParamInputComponent extends GenericInputComponent {
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
index bca33ee6c1dda0791d01759bc749005d927c2db8..e8a1f44ca145c27fef780d49aeaead3e49706aa1 100644
--- a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
+++ b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
@@ -1,6 +1,6 @@
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
 import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 
 @Component({
     selector: "dialog-confirm-close-calc",
@@ -10,7 +10,7 @@ export class DialogConfirmCloseCalcComponent {
 
     constructor(
         public dialogRef: MatDialogRef<DialogConfirmCloseCalcComponent>,
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         @Inject(MAT_DIALOG_DATA) public data: any
     ) { }
 
diff --git a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
index b6d695e5a6e7866439275e709ee77fee2d0fa371..f2334de93b12bac03b00f68bac7d303a5d6914d1 100644
--- a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
+++ b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
@@ -1,6 +1,6 @@
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
 import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 
 @Component({
     selector: "dialog-confirm-empty-session",
@@ -10,7 +10,7 @@ export class DialogConfirmEmptySessionComponent {
 
     constructor(
         public dialogRef: MatDialogRef<DialogConfirmEmptySessionComponent>,
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         @Inject(MAT_DIALOG_DATA) public data: any
     ) { }
 
diff --git a/src/app/components/dialog-load-session/dialog-load-session.component.ts b/src/app/components/dialog-load-session/dialog-load-session.component.ts
index c07202737c174ba54dedd9f4e677993cbaade559..3aa55c836a420dd0966dd5df2ae72687a382911e 100644
--- a/src/app/components/dialog-load-session/dialog-load-session.component.ts
+++ b/src/app/components/dialog-load-session/dialog-load-session.component.ts
@@ -1,6 +1,6 @@
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
 import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { FormGroup, FormBuilder, Validators } from "@angular/forms";
 import { ServiceFactory } from "../../services/service-factory";
 
@@ -19,7 +19,7 @@ export class DialogLoadSessionComponent {
 
     constructor(
       public dialogRef: MatDialogRef<DialogLoadSessionComponent>,
-      private intlService: InternationalisationService,
+      private intlService: I18nService,
       private fb: FormBuilder,
       @Inject(MAT_DIALOG_DATA) public data: any
     ) {
diff --git a/src/app/components/dialog-save-session/dialog-save-session.component.ts b/src/app/components/dialog-save-session/dialog-save-session.component.ts
index e33183c22e61ec3a8019a5e73e1ce0811ff26d8d..032ed2c65e56e026db473bc9eaca0eea6a3349a1 100644
--- a/src/app/components/dialog-save-session/dialog-save-session.component.ts
+++ b/src/app/components/dialog-save-session/dialog-save-session.component.ts
@@ -1,6 +1,6 @@
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
 import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 
 @Component({
     selector: "dialog-save-session",
@@ -15,7 +15,7 @@ export class DialogSaveSessionComponent {
 
     constructor(
       public dialogRef: MatDialogRef<DialogSaveSessionComponent>,
-      private intlService: InternationalisationService,
+      private intlService: I18nService,
       @Inject(MAT_DIALOG_DATA) public data: any
     ) {
       this.calculators = data.calculators;
diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts
index 0b7056b8f244a26aa4ef8da2dde10109002e0bbf..153a5fd4c988723293ca7325b758d2750cf99adc 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.ts
+++ b/src/app/components/fixedvar-results/fixed-results.component.ts
@@ -3,7 +3,7 @@ import { Component } from "@angular/core";
 import { FixedResults } from "../../results/fixed-results";
 import { NgParameter } from "../../formulaire/ngparam";
 import { CalculatorResults } from "../../results/calculator-results";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 import { FixedVarResultsComponent } from "./fixedvar-results.component";
 import { ResultElement } from "jalhyd";
@@ -36,7 +36,7 @@ export class FixedResultsComponent {
     private _fixedResults: FixedResults;
 
     constructor(
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         private appSetupService: ApplicationSetupService,
     ) { }
 
diff --git a/src/app/components/fixedvar-results/fixedvar-results.component.ts b/src/app/components/fixedvar-results/fixedvar-results.component.ts
index 8ef80d00cd31c5d87f31be25ce9ab12d22620246..d6dca7a41a47100383d7af0cc518c1190b680ad1 100644
--- a/src/app/components/fixedvar-results/fixedvar-results.component.ts
+++ b/src/app/components/fixedvar-results/fixedvar-results.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild, DoCheck } from "@angular/core";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { LogComponent } from "../../components/log/log.component";
 import { FixedResults } from "../../results/fixed-results";
 import { VarResults } from "../../results/var-results";
@@ -66,7 +66,7 @@ export class FixedVarResultsComponent implements DoCheck {
     private resultsGraphComponent: ResultsGraphComponent;
 
     constructor(
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         private appSetupService: ApplicationSetupService,
     ) { }
 
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index a7df06053b68ab943b682b826c78fbe4f5e0ef6c..e2b651ed2b29cd137fbf47e67612fe7301ba1d5e 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from "@angular/core";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { VarResults } from "../../results/var-results";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 import { ResultElement } from "jalhyd";
@@ -26,7 +26,7 @@ export class VarResultsComponent {
     private _headers: string[];
 
     constructor(
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         private appSetupService: ApplicationSetupService,
     ) { }
 
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 98f0759ed3de8dcfd1135cdd03cab83c8ece2325..2a383b84cee6fde556393d6edc4bd36417f3b396 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute } from "@angular/router";
 import { Observer } from "jalhyd";
 
 import { FormulaireService } from "../../services/formulaire/formulaire.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { FieldSet } from "../../formulaire/fieldset";
 import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
 import { CalculatorResultsComponent } from "../../components/calculator-results/calculator-results.component";
@@ -84,7 +84,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
 
     // services
 
-    private intlService: InternationalisationService;
+    private intlService: I18nService;
     private formulaireService: FormulaireService;
 
     constructor(
@@ -92,7 +92,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
         private confirmCloseCalcDialog: MatDialog
     ) {
         super();
-        this.intlService = ServiceFactory.instance.internationalisationService;
+        this.intlService = ServiceFactory.instance.i18nService;
         this.formulaireService = ServiceFactory.instance.formulaireService;
     }
 
@@ -264,7 +264,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
     // interface Observer
 
     update(sender: any, data: any): void {
-        if (sender instanceof InternationalisationService) {
+        if (sender instanceof I18nService) {
             this.formulaireService.updateLocalisation();
         } else if (sender instanceof FormulaireService) {
             switch (data["action"]) {
diff --git a/src/app/components/log-entry/log-entry.component.ts b/src/app/components/log-entry/log-entry.component.ts
index 3b53858779aff9a9eef7182fbe49a396640e6c46..1e7fa254a905d10e99e8ee966be59bcc8076e2e0 100644
--- a/src/app/components/log-entry/log-entry.component.ts
+++ b/src/app/components/log-entry/log-entry.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges } from "@angular/core";
 
 import { Message, MessageSeverity } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 
 @Component({
@@ -28,7 +28,7 @@ export class LogEntryComponent implements OnChanges {
     private _text: string;
 
     constructor(
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
         private appSetupService: ApplicationSetupService
     ) { }
 
diff --git a/src/app/components/log/log.component.ts b/src/app/components/log/log.component.ts
index 67234e62f6a8bf6b9ec639660ac59bab4069c41b..83eb05fe08573dcd02cc79d66b830ae495c7dfaa 100644
--- a/src/app/components/log/log.component.ts
+++ b/src/app/components/log/log.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 
 import { cLog, Message } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 
 @Component({
     selector: "log",
@@ -35,7 +35,7 @@ export class LogComponent {
     private _log: cLog;
 
     constructor(
-        private intlService: InternationalisationService,
+        private intlService: I18nService,
     ) { }
 
     private get uitextTitreJournal() {
diff --git a/src/app/components/ngparam-input/ngparam-input.component.ts b/src/app/components/ngparam-input/ngparam-input.component.ts
index 44ba1ed15637c76ef47855b772446d73eecc82d6..11d004d7514adada257030522afdc89a7f785693 100644
--- a/src/app/components/ngparam-input/ngparam-input.component.ts
+++ b/src/app/components/ngparam-input/ngparam-input.component.ts
@@ -4,7 +4,7 @@ import { Component, ChangeDetectorRef, OnDestroy } from "@angular/core";
 
 import { isNumeric, Message, Observer } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 import { GenericInputComponent } from "../generic-input/generic-input.component";
 
@@ -26,7 +26,7 @@ export class NgParamInputComponent extends GenericInputComponent implements Obse
      */
     private _tmp: number;
 
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/param-field-line/param-field-line.component.ts b/src/app/components/param-field-line/param-field-line.component.ts
index 6282e176e28510041610c853da5c6eedc24cb1f3..d9d1a49cfcc88be1898cfea3d1946beb1c0a4dc3 100644
--- a/src/app/components/param-field-line/param-field-line.component.ts
+++ b/src/app/components/param-field-line/param-field-line.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild, Input, Output, EventEmitter, OnChanges } from "@angular/core";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter, ParamRadioConfig } from "../../formulaire/ngparam";
 import { NgParamInputComponent } from "../ngparam-input/ngparam-input.component";
 import { ServiceFactory } from "../../services/service-factory";
@@ -31,7 +31,7 @@ import { ParamLinkComponent } from "../param-link/param-link.component";
 export class ParamFieldLineComponent implements OnChanges {
 
     constructor() {
-        this.intlService = ServiceFactory.instance.internationalisationService;
+        this.intlService = ServiceFactory.instance.i18nService;
         this._formService = ServiceFactory.instance.formulaireService;
         this.valid = new EventEmitter();
         this.inputChange = new EventEmitter();
@@ -222,7 +222,7 @@ export class ParamFieldLineComponent implements OnChanges {
      */
     private _isRangeValid = true;
 
-    private intlService: InternationalisationService;
+    private intlService: I18nService;
 
     private _formService: FormulaireService;
 
diff --git a/src/app/components/param-values/ngparam-max.component.ts b/src/app/components/param-values/ngparam-max.component.ts
index de13b6e24272dea9836d02097446c03b202ec1e0..9a261c0de65b97f0a11a503f2f35784145bd59af 100644
--- a/src/app/components/param-values/ngparam-max.component.ts
+++ b/src/app/components/param-values/ngparam-max.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
 import { isNumeric } from "jalhyd";
 
 import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 
 @Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
     templateUrl: "../generic-input/generic-input.component.html"
 })
 export class NgParamMaxComponent extends GenericInputComponent {
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/param-values/ngparam-min.component.ts b/src/app/components/param-values/ngparam-min.component.ts
index 89e119f03533bf517b83940c73f6db176b192270..ee3186e2f6c40d1e61e4e411585543927a8861d1 100644
--- a/src/app/components/param-values/ngparam-min.component.ts
+++ b/src/app/components/param-values/ngparam-min.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
 import { isNumeric } from "jalhyd";
 
 import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 
 @Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
     templateUrl: "../generic-input/generic-input.component.html"
 })
 export class NgParamMinComponent extends GenericInputComponent {
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/param-values/ngparam-step.component.ts b/src/app/components/param-values/ngparam-step.component.ts
index bbddcebf2f27f0a2ac55e75d3957ebf292283e2e..28f203c29cb63f79dad16f98b9e75d5d48bfc78e 100644
--- a/src/app/components/param-values/ngparam-step.component.ts
+++ b/src/app/components/param-values/ngparam-step.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
 import { isNumeric } from "jalhyd";
 
 import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 
 @Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
     templateUrl: "../generic-input/generic-input.component.html"
 })
 export class NgParamStepComponent extends GenericInputComponent {
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/param-values/param-values.component.ts b/src/app/components/param-values/param-values.component.ts
index ef8c20a92bf590e6a63c3ad1d25c01ab051dd581..d7f2b4b57a7ff4176a9398a5ef785e675cfdd902 100644
--- a/src/app/components/param-values/param-values.component.ts
+++ b/src/app/components/param-values/param-values.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, Output, EventEmitter, ViewChild, AfterViewChecked, On
 
 import { ParamValueMode } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 import { NgParamMinComponent } from "./ngparam-min.component";
 import { NgParamMaxComponent } from "./ngparam-max.component";
@@ -98,7 +98,7 @@ export class ParamValuesComponent extends BaseComponent implements AfterViewChec
     @Output()
     private valid: EventEmitter<boolean>;
 
-    constructor(private intlService: InternationalisationService) {
+    constructor(private intlService: I18nService) {
         super();
         this._valueModes.push({ "value": ParamValueMode.MINMAX, "label": "Min/max" });
         this._valueModes.push({ "value": ParamValueMode.LISTE, "label": "Liste" });
diff --git a/src/app/components/param-values/value-list.component.ts b/src/app/components/param-values/value-list.component.ts
index 542e770b68e351baa6601afd2604cba6a8b8bb23..2f692e5b9b2d8d51357712e27867f8b6a1d0254b 100644
--- a/src/app/components/param-values/value-list.component.ts
+++ b/src/app/components/param-values/value-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, ChangeDetectorRef } from "@angular/core";
 
 import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { NgParameter } from "../../formulaire/ngparam";
 import { Message } from "jalhyd";
 
@@ -10,7 +10,7 @@ import { Message } from "jalhyd";
     templateUrl: "../generic-input/generic-input.component.html"
 })
 export class ValueListComponent extends GenericInputComponent {
-    constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+    constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
         super(cdRef);
     }
 
diff --git a/src/app/components/remous-results/remous-results.component.ts b/src/app/components/remous-results/remous-results.component.ts
index 3d47a77084d5c90028e3fb5f7916593f843429ce..21d0cab670f57bb15bf1d1463af733c2f0237f3e 100644
--- a/src/app/components/remous-results/remous-results.component.ts
+++ b/src/app/components/remous-results/remous-results.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild, DoCheck } from "@angular/core";
 
 import { ArrayReverseIterator, ResultElement, INumberIterator } from "jalhyd";
 
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { LogComponent } from "../../components/log/log.component";
 import { RemousResults } from "../../results/remous-results";
 import { CalculatorResults } from "../../results/calculator-results";
@@ -248,7 +248,7 @@ export class RemousResultsComponent implements DoCheck {
     @ViewChild(LogComponent)
     private logComponent: LogComponent;
 
-    constructor(private intlService: InternationalisationService) {
+    constructor(private intlService: I18nService) {
     }
 
     private get uitextLigneFluviale() {
diff --git a/src/app/components/result-element/result-element-base.component.ts b/src/app/components/result-element/result-element-base.component.ts
index d30921bbea27adaa69cd3fec8d07b63b524a1f52..7e6eecb30af4692c260346b979e802edf538b7f6 100644
--- a/src/app/components/result-element/result-element-base.component.ts
+++ b/src/app/components/result-element/result-element-base.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from "@angular/core";
 import { ResultElement } from "jalhyd";
 
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { OnChanges } from "@angular/core/src/metadata/lifecycle_hooks";
 import { ServiceFactory } from "../../services/service-factory";
 
@@ -53,12 +53,12 @@ export class ResultElementBaseComponent implements OnChanges {
 
     protected appSetupService: ApplicationSetupService;
 
-    protected intlService: InternationalisationService;
+    protected intlService: I18nService;
 
     constructor(
     ) {
         this.appSetupService = ServiceFactory.instance.applicationSetupService;
-        this.intlService = ServiceFactory.instance.internationalisationService;
+        this.intlService = ServiceFactory.instance.i18nService;
     }
 
     /**
diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts
index ae3598d0fc1a560b047b9480d228f34caac61771..83ad69517fa2676d6d94324a98e2b4b52f89042f 100644
--- a/src/app/components/section-results/section-results.component.ts
+++ b/src/app/components/section-results/section-results.component.ts
@@ -6,7 +6,7 @@ import { SectionCanvasComponent } from "../section-canvas/section-canvas.compone
 import { SectionResults } from "../../results/section-results";
 import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
 import { CalculatorResults } from "../../results/calculator-results";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 
 @Component({
     selector: "section-results",
@@ -33,7 +33,7 @@ import { InternationalisationService } from "../../services/internationalisation
 })
 export class SectionResultsComponent implements DoCheck {
 
-    constructor(private appSetupService: ApplicationSetupService, private intlService: InternationalisationService) { }
+    constructor(private appSetupService: ApplicationSetupService, private intlService: I18nService) { }
 
     public set results(rs: CalculatorResults[]) {
         this._resultElement = undefined;
diff --git a/src/app/formulaire/definition/concrete/form-section-parametree.ts b/src/app/formulaire/definition/concrete/form-section-parametree.ts
index 5b2e2bd2d29f3564f37d141ae3f8364fc464aea9..e5d22bcf919c95bb75d229c64fe0da09be0dd916 100644
--- a/src/app/formulaire/definition/concrete/form-section-parametree.ts
+++ b/src/app/formulaire/definition/concrete/form-section-parametree.ts
@@ -6,7 +6,7 @@ import { NgParameter } from "../../ngparam";
 import { InputField } from "../../input-field";
 import { FormComputeSectionParametree } from "../form-compute-section-parametree";
 import { FormulaireDefinition } from "../form-definition";
-import { InternationalisationService } from "../../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../../services/internationalisation/internationalisation.service";
 import { CalculatorResults } from "../../../results/calculator-results";
 import { FormDefFixedVar } from "../form-def-fixedvar";
 import { FieldSet } from "../../fieldset";
diff --git a/src/app/formulaire/formulaire-element.ts b/src/app/formulaire/formulaire-element.ts
index 306b9bc6345fb73f78a5661d231c031c918a0532..0b55e21b8e97f9317ea61dae26c5e7d97fd100e0 100644
--- a/src/app/formulaire/formulaire-element.ts
+++ b/src/app/formulaire/formulaire-element.ts
@@ -5,7 +5,7 @@ import { DependencyCondition, DependencyConditionType } from "./dependency/depen
 import { ValueDependencyCondition } from "./dependency/value-dependency-condition";
 import { ExistenceDependency } from "./dependency/existence-dependency";
 import { DeepFormulaireElementIterator } from "./form-iterator/deep-element-iterator";
-import { InternationalisationService } from "../services/internationalisation/internationalisation.service";
+import { I18nService } from "../services/internationalisation/internationalisation.service";
 import { ServiceFactory } from "../services/service-factory";
 
 /**
@@ -27,7 +27,7 @@ export abstract class FormulaireElement extends FormulaireNode {
      */
     private _labelNumber: number;
 
-    private intlService: InternationalisationService;
+    private intlService: I18nService;
 
     protected _dependencies: Dependency[] = [];
 
@@ -42,7 +42,7 @@ export abstract class FormulaireElement extends FormulaireNode {
     constructor(parent: FormulaireNode) {
         super(parent);
         this._isDisplayed = true;
-        this.intlService = ServiceFactory.instance.internationalisationService;
+        this.intlService = ServiceFactory.instance.i18nService;
     }
 
     get isDisplayed(): boolean {
diff --git a/src/app/results/var-results.ts b/src/app/results/var-results.ts
index 4776f5d8837a41013655fb42cb618e8bf34f8064..657dd44f690b3ea84912c475aa618697e1421765 100644
--- a/src/app/results/var-results.ts
+++ b/src/app/results/var-results.ts
@@ -140,7 +140,7 @@ export class VarResults extends CalculatedParamResults {
 
         // entêtes des résultats supplémentaires
 
-        const intlService = ServiceFactory.instance.internationalisationService;
+        const intlService = ServiceFactory.instance.i18nService;
         for (const k of this._extraResultKeys) {
             this._extraResultHeaders.push(intlService.getExtraResLabel(k));
         }
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index 8fafb0635cf636131b785fbf4e8f56b7907c67bc..36d8e7798252fdd59165c092bd9ad5e37f0b7341 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -7,7 +7,7 @@ import { saveAs } from "file-saver";
 import { CalculatorType, EnumEx, Observable, ParamDefinition } from "jalhyd";
 
 import { HttpService } from "../../services/http/http.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
 import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
 import { FormulaireElement } from "../../formulaire/formulaire-element";
 import { InputField } from "../../formulaire/input-field";
@@ -29,15 +29,15 @@ export class FormulaireService extends Observable {
     private _currentFormId: string = null;
 
     constructor(
-        private internationalisationService: InternationalisationService,
+        private i18nService: I18nService,
         private httpService: HttpService) {
 
         super();
         this._formulaires = [];
     }
 
-    private get _intlService(): InternationalisationService {
-        return this.internationalisationService;
+    private get _intlService(): I18nService {
+        return this.i18nService;
     }
 
     private get _httpService(): HttpService {
diff --git a/src/app/services/internationalisation/internationalisation.service.ts b/src/app/services/internationalisation/internationalisation.service.ts
index ebb9df3a1e784a6ce818c560e2d1043d224528db..88bdc9fae5b30e3f654cb82394046a410d255458 100644
--- a/src/app/services/internationalisation/internationalisation.service.ts
+++ b/src/app/services/internationalisation/internationalisation.service.ts
@@ -43,7 +43,7 @@ export class Language {
 }
 
 @Injectable()
-export class InternationalisationService extends Observable {
+export class I18nService extends Observable {
 
     private _currLang: Language;
     private _Messages: StringMap;
@@ -108,7 +108,7 @@ export class InternationalisationService extends Observable {
             this._Messages = undefined;
             const prom = this.httpGetMessages();
 
-            const is: InternationalisationService = this;
+            const is: I18nService = this;
             prom.then((res) => {
                 is.notifyObservers(undefined);
             });
@@ -116,7 +116,7 @@ export class InternationalisationService extends Observable {
     }
 
     private httpGetMessages(): Promise<void> {
-        const is: InternationalisationService = this;
+        const is: I18nService = this;
         const processData = function (s: string) {
             // fermeture nécessaire pour capturer la valeur de this (undefined sinon)
             is._Messages = JSON.parse(s);
diff --git a/src/app/services/param/param.service.ts b/src/app/services/param/param.service.ts
index be0abf19ef81bdb1b3b15b19b2f7f26dfeafe2a1..d8d36ce021e17b7983832358c5f14dcdcea10a99 100644
--- a/src/app/services/param/param.service.ts
+++ b/src/app/services/param/param.service.ts
@@ -2,7 +2,7 @@ import { ParamDomain, ParamDefinition, ParamDomainValue, ParamCalculability, Ses
 
 import { NgParameter } from "../../formulaire/ngparam";
 import { Injectable } from "@angular/core";
-import { InternationalisationService } from "../internationalisation/internationalisation.service";
+import { I18nService } from "../internationalisation/internationalisation.service";
 import { ApplicationSetupService } from "../app-setup/app-setup.service";
 import { FormulaireNode } from "../../formulaire/formulaire-node";
 
@@ -10,12 +10,12 @@ import { FormulaireNode } from "../../formulaire/formulaire-node";
 export class ParamService {
 
     constructor(
-        private internationalisationService: InternationalisationService,
+        private i18nService: I18nService,
         private applicationSetupService: ApplicationSetupService
         ) { }
 
-    private get _intlService(): InternationalisationService {
-        return this.internationalisationService;
+    private get _intlService(): I18nService {
+        return this.i18nService;
     }
 
     private get _appSetupService(): ApplicationSetupService {
diff --git a/src/app/services/service-factory.ts b/src/app/services/service-factory.ts
index 682cc5c087028c83d8fa68fe58282fe8e783ab5e..0e84febabaaa2f1120406de9e2370b4be7b5d9da 100644
--- a/src/app/services/service-factory.ts
+++ b/src/app/services/service-factory.ts
@@ -1,7 +1,7 @@
 import { ApplicationSetupService } from "./app-setup/app-setup.service";
 import { ParamService } from "./param/param.service";
 import { FormulaireService } from "./formulaire/formulaire.service";
-import { InternationalisationService } from "./internationalisation/internationalisation.service";
+import { I18nService } from "./internationalisation/internationalisation.service";
 import { HttpService } from "./http/http.service";
 
 export class ServiceFactory {
@@ -15,7 +15,7 @@ export class ServiceFactory {
 
     public formulaireService: FormulaireService;
 
-    public internationalisationService: InternationalisationService;
+    public i18nService: I18nService;
 
     public httpService: HttpService;