diff --git a/docs/about/naming_architecture_code.odt b/docs/about/naming_architecture_code.odt
index afd6964ed9a28c51e50d6a903af62021ddea5dbe..608d9d2583a8d893e14c4b20e4c7c49bf8f92376 100644
Binary files a/docs/about/naming_architecture_code.odt and b/docs/about/naming_architecture_code.odt differ
diff --git a/docs/about/naming_architecture_code.pdf b/docs/about/naming_architecture_code.pdf
index 42d7e00b6e164199a9d26859965c42f429aa07c4..9eeaa81d1dbd8b9319af2d4bfa0b7bb1d09ca279 100644
Binary files a/docs/about/naming_architecture_code.pdf and b/docs/about/naming_architecture_code.pdf differ
diff --git a/docs/about/naming_rest_api_brief_introduction.odt b/docs/about/naming_rest_api_brief_introduction.odt
index 62346894edc53eaeefb43fa4aecbf94dadff6f34..60d8aec311e054c3f8711cf85e2bb053a049df95 100644
Binary files a/docs/about/naming_rest_api_brief_introduction.odt and b/docs/about/naming_rest_api_brief_introduction.odt differ
diff --git a/docs/about/naming_rest_api_brief_introduction.pdf b/docs/about/naming_rest_api_brief_introduction.pdf
index 2bdbb35f38202f3653e9877c8522daf0aae70e78..23cfaa04339aae78e448d9eb88e16430bcc1165f 100644
Binary files a/docs/about/naming_rest_api_brief_introduction.pdf and b/docs/about/naming_rest_api_brief_introduction.pdf differ
diff --git a/docs/about/naming_rest_api_cheat_sheet.odg b/docs/about/naming_rest_api_cheat_sheet.odg
index b31e37777e2c8c24fea18dcf478973dd5f613c20..12df959226a0761d5da461127d6ef6887620a193 100644
Binary files a/docs/about/naming_rest_api_cheat_sheet.odg and b/docs/about/naming_rest_api_cheat_sheet.odg differ
diff --git a/docs/about/naming_rest_api_cheat_sheet.pdf b/docs/about/naming_rest_api_cheat_sheet.pdf
index 55079a4e86833133830271f58f5c195cb0c5e0d2..da844811b815dfe9e3a2b1268abdab20dd6c5586 100644
Binary files a/docs/about/naming_rest_api_cheat_sheet.pdf and b/docs/about/naming_rest_api_cheat_sheet.pdf differ
diff --git a/docs/about/naming_rest_api_excel_guide.odt b/docs/about/naming_rest_api_excel_guide.odt
index f08b8278d6f7a15e93b493bb15bd989f6e664878..f6da141e7c8df623aec11f1fbdcd9731f078ed93 100644
Binary files a/docs/about/naming_rest_api_excel_guide.odt and b/docs/about/naming_rest_api_excel_guide.odt differ
diff --git a/docs/about/naming_rest_api_excel_guide.pdf b/docs/about/naming_rest_api_excel_guide.pdf
index ff4d75d11f6ca37c9900085ee57b00cde9d90335..55e2f31241bb340bd2f4cb2daee7ec1dc689ae8e 100644
Binary files a/docs/about/naming_rest_api_excel_guide.pdf and b/docs/about/naming_rest_api_excel_guide.pdf differ
diff --git a/docs/developer/useful/useful.odg b/docs/developer/useful/useful.odg
index b710a4c48ae296231ec35a5f41a0607eb44fdcaf..6e35a8f1c44bd75e52a0f51c9d3580d3c715fc58 100644
Binary files a/docs/developer/useful/useful.odg and b/docs/developer/useful/useful.odg differ
diff --git a/src/main/java/org/openepics/names/rest/beans/Type.java b/src/main/java/org/openepics/names/rest/beans/Type.java
index ee72e4f6c0eec17d8d1c39a4e7911bd92a431512..2a939b0c8bdbf7e933d637945acdeea4db9c3387 100644
--- a/src/main/java/org/openepics/names/rest/beans/Type.java
+++ b/src/main/java/org/openepics/names/rest/beans/Type.java
@@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
  */
 @Schema(description = "A collection of values for type of structure entry. "
         + "It is used to show what kind of entry and which level in parent / child hierarchy "
-        + "for system structure and device structure.")
+        + "for system structure and device structure. ")
 public enum Type {
 
     @Schema(description = "System structure 1st level.")
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
index e3e9bb11c7aba2d9e480b54f562dca2a79ab897a..18a087afd5d8bcfc698965323b291fd8c5610ed8 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
@@ -44,7 +44,7 @@ public class StructureElementCommand implements Serializable {
 
     @Schema(description = "Identity (uuid) of the structure entry. Value is created server-side.")
     private UUID uuid;
-    @Schema(description = "Type of the structure entry.")
+    @Schema(description = "Type of the structure entry. Valid values - SYSTEMGROUP, SYSTEM, SUBSYSTEM, DISCIPLINE, DEVICEGROUP, DEVICETYPE.")
     private Type type;
     @Schema(description = "Identity (uuid) for the structure entry parent (if the structure entry has a parent).")
     private UUID parent;
diff --git a/src/main/java/org/openepics/names/util/ExcelUtil.java b/src/main/java/org/openepics/names/util/ExcelUtil.java
index 1215d107ae86d86a2106b62d9bade2f7af5d4d17..9580316f3fe4c2b955de6047079c14589862e669 100644
--- a/src/main/java/org/openepics/names/util/ExcelUtil.java
+++ b/src/main/java/org/openepics/names/util/ExcelUtil.java
@@ -93,7 +93,7 @@ public class ExcelUtil {
     private static final int        STRUCTUREELEMENTCOMMAND_LENGTH  = 7;
     private static final String[][] STRUCTUREELEMENT_HEADER_COMMENT = {
             {"Uuid",                  "Identity (uuid) of the structure entry. Value is created server-side."},
-            {"Type",                  "Type of the structure entry."},
+            {"Type",                  "Type of the structure entry. Valid values - SYSTEMGROUP, SYSTEM, SUBSYSTEM, DISCIPLINE, DEVICEGROUP, DEVICETYPE."},
             {"Parent",                "Identity (uuid) for the structure entry parent (if the structure entry has a parent)."},
             {"Name",                  "Name (verbose) of the structure entry."},
             {"Mnemonic",              "Mnemonic of the structure entry."},
diff --git a/src/main/resources/static/pdfs/naming_rest_api_brief_introduction.pdf b/src/main/resources/static/pdfs/naming_rest_api_brief_introduction.pdf
index 2bdbb35f38202f3653e9877c8522daf0aae70e78..23cfaa04339aae78e448d9eb88e16430bcc1165f 100644
Binary files a/src/main/resources/static/pdfs/naming_rest_api_brief_introduction.pdf and b/src/main/resources/static/pdfs/naming_rest_api_brief_introduction.pdf differ
diff --git a/src/main/resources/static/pdfs/naming_rest_api_cheat_sheet.pdf b/src/main/resources/static/pdfs/naming_rest_api_cheat_sheet.pdf
index 55079a4e86833133830271f58f5c195cb0c5e0d2..da844811b815dfe9e3a2b1268abdab20dd6c5586 100644
Binary files a/src/main/resources/static/pdfs/naming_rest_api_cheat_sheet.pdf and b/src/main/resources/static/pdfs/naming_rest_api_cheat_sheet.pdf differ
diff --git a/src/main/resources/static/pdfs/naming_rest_api_excel_guide.pdf b/src/main/resources/static/pdfs/naming_rest_api_excel_guide.pdf
index ff4d75d11f6ca37c9900085ee57b00cde9d90335..55e2f31241bb340bd2f4cb2daee7ec1dc689ae8e 100644
Binary files a/src/main/resources/static/pdfs/naming_rest_api_excel_guide.pdf and b/src/main/resources/static/pdfs/naming_rest_api_excel_guide.pdf differ
diff --git a/src/main/resources/static/templates/StructureElementCommand.xlsx b/src/main/resources/static/templates/StructureElementCommand.xlsx
index 95ac1775957aced5957b45ddbb8e1191b4687112..c85d544f9f7119f0a945bd81af6084fe2e539a7a 100644
Binary files a/src/main/resources/static/templates/StructureElementCommand.xlsx and b/src/main/resources/static/templates/StructureElementCommand.xlsx differ
diff --git a/src/test/resources/db/data/templates/NameElementCommand_name_create.xlsx b/src/test/resources/db/data/templates/NameElementCommand_name_create.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c9c341a2e84488af7e9877fa1b8afee23cae9f2e
Binary files /dev/null and b/src/test/resources/db/data/templates/NameElementCommand_name_create.xlsx differ
diff --git a/src/test/resources/db/data/templates/StructureElementCommand_system_create.xlsx b/src/test/resources/db/data/templates/StructureElementCommand_system_create.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b5ade2e604f74b852e9a00b4239bd4f54c5d6757
Binary files /dev/null and b/src/test/resources/db/data/templates/StructureElementCommand_system_create.xlsx differ