diff --git a/.github/workflows/RenderAllDiagrams.yml b/.github/workflows/RenderAllDiagrams.yml
index 3087538..f767e3c 100644
--- a/.github/workflows/RenderAllDiagrams.yml
+++ b/.github/workflows/RenderAllDiagrams.yml
@@ -50,7 +50,7 @@ jobs:
           for dir in $FileNamePaths
           do
             # Render SVGs from PUMLs
-            find $dir -name "*.puml" -exec java -jar plantuml.jar -tsvg {} \;
+            find $dir -name "*.puml" -exec java -jar plantuml.jar -tsvg -filename $dir {} \;
           done
 
       # Generate the SVGs from DrawIO
@@ -58,6 +58,7 @@ jobs:
         uses: rlespinasse/drawio-export-action@v2
         with:
           path: ./Material/imgsrc/drawio/ 
+          remove-page-suffix: true
           output: .
           format: svg
           action-mode: all
diff --git a/Material/imgsrc/drawio/Klassendiagramm.drawio b/Material/imgsrc/drawio/Klassendiagramm_Example.drawio
similarity index 100%
rename from Material/imgsrc/drawio/Klassendiagramm.drawio
rename to Material/imgsrc/drawio/Klassendiagramm_Example.drawio
diff --git a/Material/imgsrc/plantuml/amts_data_objects.puml b/Material/imgsrc/plantuml/Components_Example.puml
similarity index 74%
rename from Material/imgsrc/plantuml/amts_data_objects.puml
rename to Material/imgsrc/plantuml/Components_Example.puml
index ae92f0a..93b8d96 100644
--- a/Material/imgsrc/plantuml/amts_data_objects.puml
+++ b/Material/imgsrc/plantuml/Components_Example.puml
@@ -1,5 +1,5 @@
 ```plantuml
-@startuml component_example
+@startuml
 actor client
 node app
 database db
diff --git a/Material/imgsrc/plantuml/noName_Example.puml b/Material/imgsrc/plantuml/noName_Example.puml
new file mode 100644
index 0000000..620c9b4
--- /dev/null
+++ b/Material/imgsrc/plantuml/noName_Example.puml
@@ -0,0 +1,10 @@
+```plantuml
+@startuml nameInSource_Example
+actor client
+node app
+database db
+
+db -> app
+app -> client
+@enduml
+```
\ No newline at end of file