diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
index e794f6a542..15a4a83112 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_advanced.svg
@@ -252,7 +252,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
index ba6516d848..a9dcbe35f6 100644
--- a/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A0_Landscape_ISO5457_minimal.svg
@@ -245,7 +245,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
index 877d1826ba..a6c72cebc2 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_advanced.svg
@@ -204,7 +204,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
index 4ace30c5a5..7f9ff8d529 100644
--- a/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A1_Landscape_ISO5457_minimal.svg
@@ -198,7 +198,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
index ae311318ca..07dc9eeb44 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_advanced.svg
@@ -172,7 +172,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
index 8c1e82b867..042afeb12f 100644
--- a/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A2_Landscape_ISO5457_minimal.svg
@@ -165,7 +165,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
index f40c3be8cc..b68aa4e837 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_advanced.svg
@@ -148,7 +148,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
index c2d25e1a9f..3dcede74b4 100644
--- a/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A3_Landscape_ISO5457_minimal.svg
@@ -141,7 +141,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
index d75d30dd6b..d82ea521a4 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_advanced.svg
@@ -123,7 +123,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
index 77b53980c0..5ed374a717 100644
--- a/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Landscape_ISO5457_minimal.svg
@@ -116,7 +116,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
index 7912ef3332..9cedb10d4a 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_advanced.svg
@@ -123,7 +123,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
index a8761974e9..bb47614039 100644
--- a/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
+++ b/src/Mod/TechDraw/Templates/A4_Portrait_ISO5457_minimal.svg
@@ -116,7 +116,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
index af503eaf60..9030f634f2 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_1_minimal.svg
@@ -72,7 +72,7 @@
ISO 5457 template
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
1 : 1
ISO 2768-m
Stainless steel Mat.No. 1.4301
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
index 5ffe11c523..831835b595 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_2.svg
@@ -69,6 +69,6 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg
index 3e7909e0a3..896e450b72 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_3_advanced.svg
@@ -79,7 +79,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
1 : 1
ISO 2768-m
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
index f886f9eea6..1b66171c6e 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_4.svg
@@ -78,7 +78,7 @@
RD
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
In preparation
A3
diff --git a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
index 5b8a1487cf..f64f7184f9 100644
--- a/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
+++ b/src/Mod/TechDraw/Templates/ISO 5457/ISO7200_titleblock_5_maximal.svg
@@ -90,7 +90,7 @@
C. Kali
B. Hecate
A. Nemesis
- Assembly Drawing
+ Component Drawing
KW
In preparation
X / Y