diff --git a/nietzsche-beta-app/src/app/app.module.ts b/nietzsche-beta-app/src/app/app.module.ts
index 264599d..f9ee034 100644
--- a/nietzsche-beta-app/src/app/app.module.ts
+++ b/nietzsche-beta-app/src/app/app.module.ts
@@ -1,97 +1,97 @@
 import { AppComponent } from './app.component';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {DragDropModule} from '@angular/cdk/drag-drop';
 import { FormsModule, ReactiveFormsModule} from '@angular/forms';
 import { NgModule } from '@angular/core';
 import {MatCardModule} from '@angular/material/card';
 import {MatButtonToggleModule, MatChipsModule} from '@angular/material';
 import { MatToolbarModule, MatButtonModule} from '@angular/material';
 import {MatProgressBarModule} from '@angular/material/progress-bar';
 import {MatTreeModule} from '@angular/material/tree';
 import { MatExpansionModule } from '@angular/material/expansion';
 import {MatIconModule} from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule} from '@angular/material/menu';
 import { MatSidenavModule } from '@angular/material';
 import { MatSelectModule } from '@angular/material/select';
 import {MatTabsModule} from '@angular/material/tabs';
 import {MatTooltipModule} from '@angular/material';
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import { QueryService } from './services/query.service';
 import {routing} from './app.routing';
 import {HomeComponent} from './home.component';
 import { ManuscriptViewComponentComponent } from './manuscript-view-component/manuscript-view-component.component';
 import { ContentViewTabComponentComponent } from './content-view-tab-component/content-view-tab-component.component';
 import { RhizomeViewComponentComponent } from './rhizome-view-component/rhizome-view-component.component';
 import { MainMenuComponentComponent } from './main-menu-component/main-menu-component.component';
 import { PageViewWrapperComponent } from './page-view-wrapper-component/page-view-wrapper.component';
 import { NavigationListComponentComponent } from './navigation-list-component/navigation-list-component.component';
 import {NavigationServiceService} from './services/navigation-service.service';
 import { TlnEditionModule} from './tln-edition/tln-edition.module';
 import { NavTree } from './navigation-list-component/navtree-directive.directive';
 import { LazyImageLoadDirectiveDirective } from './content-view-tab-component/lazy-image-load-directive.directive';
 import { ImpressumComponent } from './impressum.component';
 import { ProjectComponent } from './project.component';
 import { NavigationlistListComponentComponent } from './navigation-list-component/navigationlist-list-component/navigationlist-list-component.component';
 import { CrossrefEditorComponentComponent } from './crossref-editor-component/crossref-editor-component.component';
 import { PageCollectorComponentComponent } from './crossref-editor-component/text-genesis-editor/page-collector-component/page-collector-component.component';
 import { LineSelectorComponentComponent } from './crossref-editor-component/text-genesis-editor/line-selector-component/line-selector-component.component';
-import { TextUnitEditorComponent } from './crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor';
-import { TextVersionEditorComponent } from './crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component';
+import { TextGenesisWrapperComponent } from './crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component';
+import { TextGenesisEditorComponent } from './crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component';
 
 
 
 @NgModule({
   declarations: [
      AppComponent,
      HomeComponent,
       CrossrefEditorComponentComponent,
       PageCollectorComponentComponent,
       LineSelectorComponentComponent,
-      TextUnitEditorComponent,
-      TextVersionEditorComponent,
+      TextGenesisWrapperComponent,
+      TextGenesisEditorComponent,
      ManuscriptViewComponentComponent,
      ContentViewTabComponentComponent,
      RhizomeViewComponentComponent,
      MainMenuComponentComponent,
      PageViewWrapperComponent,
      NavigationListComponentComponent,
      NavTree,
      LazyImageLoadDirectiveDirective,
      ImpressumComponent,
      ProjectComponent,
      NavigationlistListComponentComponent
   ],
   imports: [
     routing,
     BrowserModule,
     BrowserAnimationsModule,
     CommonModule,
     DragDropModule,
     HttpClientModule,
     MatButtonModule,
     MatButtonToggleModule,
     MatCardModule,
     MatChipsModule,
     MatExpansionModule,
     MatIconModule,
     MatListModule,
     MatMenuModule,
     MatProgressBarModule,
     MatSelectModule, // for themes selection
     MatSidenavModule,
     MatTabsModule,
     MatToolbarModule,
     MatTooltipModule,
     MatTreeModule,
     FormsModule,
     TlnEditionModule,
     ReactiveFormsModule
   ],
   providers: [ NavigationServiceService, QueryService ],
   bootstrap: [AppComponent],
   entryComponents: [LineSelectorComponentComponent]
 })
 export class AppModule { }
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/crossref-editor-component.component.html b/nietzsche-beta-app/src/app/crossref-editor-component/crossref-editor-component.component.html
index d786743..9c1e364 100644
--- a/nietzsche-beta-app/src/app/crossref-editor-component/crossref-editor-component.component.html
+++ b/nietzsche-beta-app/src/app/crossref-editor-component/crossref-editor-component.component.html
@@ -1,22 +1,22 @@
 <mat-card *ngIf="!addNewTextGenesis && !editExistingTextGenesis" id="workflowChoice">
   <mat-card-content>
     <div>
       <button mat-raised-button
               class="workflow-button"
               (click)="editExistingTextGenesis = true">
         <span class="material-icons">edit</span>
         Bestehende Textgenese bearbeiten
       </button>
     </div>
     <div>
       <button mat-raised-button
               class="workflow-button"
               (click)="initNewTextgenesis()">
         <span class="material-icons">add_circle_outline</span>Neue Textgenese erfassen
       </button>
     </div>
     </mat-card-content>
 </mat-card>
 <div>
-  <app-text-version-editor></app-text-version-editor>
+  <app-text-genesis-editor></app-text-genesis-editor>
 </div>
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.html b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.html
similarity index 97%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.html
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.html
index 633270b..9c6cbcc 100644
--- a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.html
+++ b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.html
@@ -1,77 +1,77 @@
 <mat-card *ngIf="textGenesis" class = "list-container">
   <mat-card-header>
     <mat-card-title>
       Textgenese: {{textGenesis.id}}
     </mat-card-title>
     <mat-card-subtitle>
       <span *ngFor="let tVersion of textGenesis.textVersions(), let iV = index">
           <span *ngIf="tVersion.textUnits().length">
             <span *ngFor="let textUnit of tVersion.textUnits(), let iT = index">
               <span>{{textUnit.navItem.parentLabel}}: {{textUnit.displayedLabel}}</span>
               <span *ngIf="textUnit.hasStartLine()"> {{textUnit.displayedStartLine}}-{{textUnit.displayedEndLine}}</span>
               <span *ngIf="iT+1< tVersion.textUnits().length">; </span>
             </span>
             <span *ngIf="iV+1 < textGenesis.textVersions().length"> -> </span>
           </span>
         </span>
     </mat-card-subtitle>
   </mat-card-header>
   <mat-card-content>
     <mat-accordion>
       <mat-expansion-panel class="text-version"
                            *ngFor="let textVersion of textGenesis.textVersions(); let i = index"
                            [expanded]="textVersion.isCheckedOut()"
                            (closed)="textVersion.checkOut(false)"
                            (opened)="checkoutTextVersion(textVersion.iri)">
         <mat-expansion-panel-header class="text_version_header">
           <mat-panel-title>
             <div>
               <button mat-icon-button *ngIf="!textVersion.isCheckedOut()">
                 <mat-icon>expand_more</mat-icon>
               </button>
               <button mat-icon-button *ngIf="textVersion.isCheckedOut()">
                 <mat-icon>expand_less</mat-icon>
               </button>
               <span>{{i+1}}. Textversion: </span>
               <span *ngIf="textVersion.textUnits().length">
                 <span *ngFor="let textUnit of textVersion.textUnits(), let i = index">
                   <span>{{textUnit.navItem.parentLabel}}: {{textUnit.displayedLabel}}</span>
                   <span *ngIf="!textUnit.wholePage"> {{textUnit.displayedStartLine}}-{{textUnit.displayedEndLine}}</span>
                   <span *ngIf="i+1< textVersion.textUnits().length">; </span>
                 </span>
               </span>
             </div>
           </mat-panel-title>
           <mat-panel-description>
             {{textVersion.isCheckedOut()? '' : 'Panel ausklappen zum Bearbeiten ...'}}
           </mat-panel-description>
         </mat-expansion-panel-header>
         <mat-card>
           <mat-card-content>
             <button mat-raised-button
                     class="action-button"
                     [disabled]="!textVersion.textUnits().length"
                     (click)="textVersion.checkOut(false)">
               <mat-icon>check</mat-icon><span> Weiter</span>
             </button>
             <span class="delete-button">
               <button mat-raised-button class="action-button" [attr.aria-label]="'delete'" (click)="deleteTextVersion(textVersion.iri)">
               <mat-icon>delete_outline</mat-icon><span> Textversion löschen</span>
             </button>
             </span>
 
           </mat-card-content>
         </mat-card>
-        <app-text-unit-editor [versionIdx]="i"></app-text-unit-editor>
+        <app-text-genesis-wrapper-component [versionIdx]="i"></app-text-genesis-wrapper-component>
       </mat-expansion-panel>
       <button mat-raised-button class="action-button" (click)="createTextVersion()"><span class="material-icons">add</span><span>Textversion hinzufügen</span></button>
       <button mat-raised-button class="action-button" [disabled]="!textGenesis.isComplete()" (click)="preview()"><span class="material-icons">preview</span><span>Vorschau</span></button>
       <button mat-raised-button class="action-button" [disabled]="!textGenesis.isComplete()" (click)="saveToTripleStore()"><span class="material-icons">save</span><span>Speichern</span></button>
     </mat-accordion>
   </mat-card-content>
 </mat-card>
 <mat-card *ngIf="textGenesis && textGenesis.ttl_export">
   <mat-card-content >
     <code>{{textGenesis.ttl_export}}</code>
   </mat-card-content>
 </mat-card>
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.scss b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.scss
similarity index 100%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.scss
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.scss
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.ts b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.ts
similarity index 81%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.ts
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.ts
index 4e2dd51..154ee29 100644
--- a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-version-editor-component/text-version-editor.component.ts
+++ b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-editor-component/text-genesis-editor.component.ts
@@ -1,59 +1,59 @@
 import {Component, OnChanges, OnDestroy } from '@angular/core';
-import {CrossrefEditorDataServiceService, TextGenesis, TextUnit, TextVersion} from '../../crossref-editor-data-service.service';
+import {CrossrefEditorDataServiceService, TextGenesis, TextVersion} from '../../crossref-editor-data-service.service';
 import {Subscription} from 'rxjs';
 import {ActivatedRoute} from '@angular/router';
 import {NavigationServiceService} from '../../../services/navigation-service.service';
 
 @Component({
-  selector: 'app-text-version-editor',
-  templateUrl: './text-version-editor.component.html',
-  styleUrls: ['./text-version-editor.component.scss']
+  selector: 'app-text-genesis-editor',
+  templateUrl: './text-genesis-editor.component.html',
+  styleUrls: ['./text-genesis-editor.component.scss']
 })
-export class TextVersionEditorComponent implements OnChanges, OnDestroy {
+export class TextGenesisEditorComponent implements OnChanges, OnDestroy {
 
   textGenesis: TextGenesis;
   textGenesisSubscription: Subscription;
 
   constructor(private dataService: CrossrefEditorDataServiceService,
               private naviService: NavigationServiceService,
               private activatedRoute: ActivatedRoute) {
     if (this.activatedRoute.snapshot.queryParamMap.get('navBarOpenState') === 'false' || '') {
       this.naviService.updateRoute({['navBarOpenState']: 'true'});
     }
     this.textGenesisSubscription = this.dataService.textGenesisEmitter.subscribe(tGenesis => {
       this.textGenesis = tGenesis;
     })
   }
 
   ngOnChanges() {
   }
 
 
   ngOnDestroy(){ this.textGenesisSubscription.unsubscribe();
   }
 
   createTextVersion() {
     let version = new TextVersion('TextVersion', this.textGenesis.iri);
     this.textGenesis.addTextVersion(version, this.textGenesis.textVersions().length-1);
     this.dataService.updateAll(this.textGenesis);
   }
 
   checkoutTextVersion(iri: string) {
     this.textGenesis.checkoutTextVersion(iri);
     this.dataService.updateAll(this.textGenesis);
   }
 
   deleteTextVersion(iri: string) {
     this.dataService.textGenesis.deleteTextVersion(iri);
   }
 
   preview() {
     this.dataService.writeOut(false)
     // import somewhere
   }
 
   saveToTripleStore() {
     this.dataService.writeOut(true)
   }
 
 }
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.html b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.html
similarity index 100%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.html
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.html
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.scss b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.scss
similarity index 100%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.scss
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.scss
diff --git a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.ts b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.ts
similarity index 83%
rename from nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.ts
rename to nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.ts
index 00f7ae1..49d1f91 100644
--- a/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/textunit-editor-component/text-unit-editor.ts
+++ b/nietzsche-beta-app/src/app/crossref-editor-component/text-genesis-editor/text-genesis-wrapper-component/text-genesis-wrapper-component.ts
@@ -1,38 +1,38 @@
 import {Component, Input, OnChanges, OnDestroy} from '@angular/core';
 import {CrossrefEditorDataServiceService, TextGenesis, TextVersion} from '../../crossref-editor-data-service.service';
 import {NavigationServiceService} from '../../../services/navigation-service.service';
 import {Subscription} from 'rxjs';
 import {TlnEntity} from '../../../models/models';
 
 @Component({
-  selector: 'app-text-unit-editor',
-  templateUrl: './text-unit-editor.html',
-  styleUrls: ['./text-unit-editor.scss']
+  selector: 'app-text-genesis-wrapper-component',
+  templateUrl: './text-genesis-wrapper-component.html',
+  styleUrls: ['./text-genesis-wrapper-component.scss']
 })
-export class TextUnitEditorComponent implements OnChanges, OnDestroy {
+export class TextGenesisWrapperComponent implements OnChanges, OnDestroy {
   @Input() versionIdx: number;
   textVersion: TextVersion;
   textGenesisSubscription: Subscription;
   pages: TlnEntity[] = [];
 
   constructor(private naviService: NavigationServiceService, private dataService: CrossrefEditorDataServiceService) {
     this.textGenesisSubscription = this.dataService.textGenesisEmitter.subscribe(tGenesis => {
       this.resetEditorData(tGenesis);
     });
   }
 
   ngOnChanges() {
   }
 
   ngOnDestroy() {
     this.textGenesisSubscription.unsubscribe();
   }
 
   resetEditorData(tGenesis: TextGenesis) {
     if (!tGenesis || !tGenesis.checkedOutTextVersion()) {return}
     this.textVersion = tGenesis.checkedOutTextVersion();
     if (tGenesis.checkedOutTextVersion().pages()) {
       this.pages =  tGenesis.checkedOutTextVersion().pages();
     }
   }
 }