220 files changed, 124 insertions, 124 deletions

diff --git a/Makefile b/Makefile
index 48400e23..1ccb8803 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-PY_SRC_FILES = $(wildcard *.py) $(wildcard rtemsqual/*.py)
-PY_ALL_FILES = $(PY_SRC_FILES) $(wildcard rtemsqual/tests/*.py)
+PY_SRC_FILES = $(wildcard *.py) $(wildcard rtemsspec/*.py)
+PY_ALL_FILES = $(PY_SRC_FILES) $(wildcard rtemsspec/tests/*.py)
 
 all: check format analyse coverage-report
 
 check: check-env
-	coverage run --branch -m pytest -vv rtemsqual/tests
+	coverage run --branch -m pytest -vv rtemsspec/tests
 
 format: $(PY_ALL_FILES) | check-env
 	yapf -i --parallel $^
diff --git a/README.md b/README.md
index e5c6a8fe..6c0a69e3 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ development tools such as yapf, flake8, mypy, pylint, pytest, and coverage.
 
 * spec - contains the specification items
 
-* rtemsqual - contains the `rtemsqual` Python package
+* rtemsspec - contains the `rtemsspec` Python package
 
   * tests - contains Python unit tests
 
@@ -133,13 +133,13 @@ $ make coverage-report
 coverage report -m --include=...
 Name                      Stmts   Miss Branch BrPart  Cover   Missing
 ---------------------------------------------------------------------
-rtemsqual/__init__.py         8      0      0      0   100%
-rtemsqual/applconfig.py     130      0     53      0   100%
-rtemsqual/build.py           36      0     14      0   100%
-rtemsqual/content.py        133      0     44      0   100%
-rtemsqual/glossary.py        70      0     31      0   100%
-rtemsqual/items.py          139      0     46      0   100%
-rtemsqual/util.py            26      0      2      0   100%
+rtemsspec/__init__.py         8      0      0      0   100%
+rtemsspec/applconfig.py     130      0     53      0   100%
+rtemsspec/build.py           36      0     14      0   100%
+rtemsspec/content.py        133      0     44      0   100%
+rtemsspec/glossary.py        70      0     31      0   100%
+rtemsspec/items.py          139      0     46      0   100%
+rtemsspec/util.py            26      0      2      0   100%
 ---------------------------------------------------------------------
 TOTAL                       542      0    190      0   100%
 ```
diff --git a/rtems_spec_to_x.py b/rtems_spec_to_x.py
index 6fa5acaa..06653cf4 100755
--- a/rtems_spec_to_x.py
+++ b/rtems_spec_to_x.py
@@ -30,13 +30,13 @@ import string
 import subprocess
 from typing import List
 
-import rtemsqual.applconfig
-import rtemsqual.build
-from rtemsqual.items import ItemCache
-import rtemsqual.glossary
-import rtemsqual.interface
-import rtemsqual.util
-import rtemsqual.validation
+import rtemsspec.applconfig
+import rtemsspec.build
+from rtemsspec.items import ItemCache
+import rtemsspec.glossary
+import rtemsspec.interface
+import rtemsspec.util
+import rtemsspec.validation
 
 
 def _run_command(args: List[str], cwd: str) -> int:
@@ -55,10 +55,10 @@ def _run_command(args: List[str], cwd: str) -> int:
 
 
 def _run_pre_qualified_only_build(config: dict, item_cache: ItemCache) -> None:
-    files = rtemsqual.build.gather_files(config, item_cache)
+    files = rtemsspec.build.gather_files(config, item_cache)
     source_dir = config["source-directory"]
     workspace_dir = config["workspace-directory"]
-    rtemsqual.util.copy_files(source_dir, workspace_dir, files)
+    rtemsspec.util.copy_files(source_dir, workspace_dir, files)
     with open(os.path.join(workspace_dir, "config.ini"), "w") as config_ini:
         content = string.Template(config["config-ini"]).substitute(config)
         config_ini.write(content)
@@ -89,12 +89,12 @@ def _run_pre_qualified_doxygen(config: dict) -> None:
 
 def main() -> None:
     """ Generates glossaries of terms according to the configuration. """
-    config = rtemsqual.util.load_config("config.yml")
+    config = rtemsspec.util.load_config("config.yml")
     item_cache = ItemCache(config["spec"])
-    rtemsqual.glossary.generate(config["glossary"], item_cache)
-    rtemsqual.applconfig.generate(config["appl-config"], item_cache)
-    rtemsqual.interface.generate(config["interface"], item_cache)
-    rtemsqual.validation.generate(config["validation"], item_cache)
+    rtemsspec.glossary.generate(config["glossary"], item_cache)
+    rtemsspec.applconfig.generate(config["appl-config"], item_cache)
+    rtemsspec.interface.generate(config["interface"], item_cache)
+    rtemsspec.validation.generate(config["validation"], item_cache)
     _run_pre_qualified_only_build(config["build"], item_cache)
     _run_pre_qualified_doxygen(config["build"])
 
diff --git a/rtemsqual/__init__.py b/rtemsspec/__init__.py
index b936f3d0..13e4cfd0 100644
--- a/rtemsqual/__init__.py
+++ b/rtemsspec/__init__.py
@@ -29,14 +29,14 @@ __all__ = [
     "items", "specdoc", "specverify", "util", "validation"
 ]
 
-import rtemsqual.applconfig
-import rtemsqual.build
-import rtemsqual.content
-import rtemsqual.glossary
-import rtemsqual.interface
-import rtemsqual.interfacedoc
-import rtemsqual.items  # noqa: F401
-import rtemsqual.specdoc
-import rtemsqual.specverify
-import rtemsqual.util  # noqa: F401
-import rtemsqual.validation  # noqa: F401
+import rtemsspec.applconfig
+import rtemsspec.build
+import rtemsspec.content
+import rtemsspec.glossary
+import rtemsspec.interface
+import rtemsspec.interfacedoc
+import rtemsspec.items  # noqa: F401
+import rtemsspec.specdoc
+import rtemsspec.specverify
+import rtemsspec.util  # noqa: F401
+import rtemsspec.validation  # noqa: F401
diff --git a/rtemsqual/applconfig.py b/rtemsspec/applconfig.py
index 94de7232..bd08c8c7 100644
--- a/rtemsqual/applconfig.py
+++ b/rtemsspec/applconfig.py
@@ -27,10 +27,10 @@
 import copy
 from typing import Any, Dict, List, Optional
 
-from rtemsqual.content import CContent, get_value_double_colon, \
+from rtemsspec.content import CContent, get_value_double_colon, \
     get_value_doxygen_function, get_value_hash
-from rtemsqual.sphinxcontent import SphinxContent, SphinxMapper
-from rtemsqual.items import EmptyItem, Item, ItemCache, ItemGetValueContext, \
+from rtemsspec.sphinxcontent import SphinxContent, SphinxMapper
+from rtemsspec.items import EmptyItem, Item, ItemCache, ItemGetValueContext, \
     ItemMapper
 
 ItemMap = Dict[str, Item]
diff --git a/rtemsqual/build.py b/rtemsspec/build.py
index c2ed5123..f1ca2be9 100644
--- a/rtemsqual/build.py
+++ b/rtemsspec/build.py
@@ -26,7 +26,7 @@
 
 from typing import Dict, List
 
-from rtemsqual.items import Item, ItemCache
+from rtemsspec.items import Item, ItemCache
 
 BSPMap = Dict[str, Dict[str, Item]]
 ItemMap = Dict[str, Item]
diff --git a/rtemsqual/content.py b/rtemsspec/content.py
index 358560a9..30a1a81d 100644
--- a/rtemsqual/content.py
+++ b/rtemsspec/content.py
@@ -36,7 +36,7 @@ import textwrap
 from typing import Any, Callable, ContextManager, Dict, Iterable, Iterator, \
     List, NamedTuple, Optional, Set, Tuple, Union
 
-from rtemsqual.items import Item, ItemGetValueContext
+from rtemsspec.items import Item, ItemGetValueContext
 
 AddContext = Callable[["Content"], ContextManager[None]]
 GenericContent = Union[str, List[str], "Content"]
diff --git a/rtemsqual/glossary.py b/rtemsspec/glossary.py
index 0524ef42..1131f45b 100644
--- a/rtemsqual/glossary.py
+++ b/rtemsspec/glossary.py
@@ -28,8 +28,8 @@ import glob
 import re
 from typing import Any, Dict, NamedTuple
 
-from rtemsqual.sphinxcontent import SphinxContent, SphinxMapper
-from rtemsqual.items import Item, ItemCache, ItemGetValueContext, ItemMapper
+from rtemsspec.sphinxcontent import SphinxContent, SphinxMapper
+from rtemsspec.items import Item, ItemCache, ItemGetValueContext, ItemMapper
 
 ItemMap = Dict[str, Item]
 
diff --git a/rtemsqual/interface.py b/rtemsspec/interface.py
index 9b33cf1d..13cab4b6 100644
--- a/rtemsqual/interface.py
+++ b/rtemsspec/interface.py
@@ -28,10 +28,10 @@ from contextlib import contextmanager
 import os
 from typing import Any, Callable, Dict, Iterator, List, Union
 
-from rtemsqual.content import CContent, CInclude, enabled_by_to_exp, \
+from rtemsspec.content import CContent, CInclude, enabled_by_to_exp, \
     ExpressionMapper, get_value_double_colon, get_value_doxygen_function, \
     get_value_hash
-from rtemsqual.items import Item, ItemCache, ItemGetValueContext, ItemMapper
+from rtemsspec.items import Item, ItemCache, ItemGetValueContext, ItemMapper
 
 ItemMap = Dict[str, Item]
 Lines = Union[str, List[str]]
diff --git a/rtemsqual/interfacedoc.py b/rtemsspec/interfacedoc.py
index 8402e922..5843bb0f 100644
--- a/rtemsqual/interfacedoc.py
+++ b/rtemsspec/interfacedoc.py
@@ -29,10 +29,10 @@ This module provides functions for the generation of interface documentation.
 import os
 from typing import Any, Callable, Dict, List
 
-from rtemsqual.content import CContent, enabled_by_to_exp, ExpressionMapper
-from rtemsqual.sphinxcontent import get_label, get_reference, SphinxContent, \
+from rtemsspec.content import CContent, enabled_by_to_exp, ExpressionMapper
+from rtemsspec.sphinxcontent import get_label, get_reference, SphinxContent, \
      SphinxMapper
-from rtemsqual.items import Item, ItemCache, ItemGetValueContext, ItemMapper
+from rtemsspec.items import Item, ItemCache, ItemGetValueContext, ItemMapper
 
 ItemMap = Dict[str, Item]
 AddDefinition = Callable[[CContent, ItemMapper, Item, Dict[str, Any]], None]
diff --git a/rtemsqual/items.py b/rtemsspec/items.py
index 06c13525..06c13525 100644
--- a/rtemsqual/items.py
+++ b/rtemsspec/items.py
diff --git a/rtemsqual/specdoc.py b/rtemsspec/specdoc.py
index d5aaf724..40e4a47b 100644
--- a/rtemsqual/specdoc.py
+++ b/rtemsspec/specdoc.py
@@ -26,10 +26,10 @@
 
 from typing import Any, Dict, Iterator, List, Optional, Set, Tuple
 
-from rtemsqual.sphinxcontent import get_reference, get_label, \
+from rtemsspec.sphinxcontent import get_reference, get_label, \
     SphinxContent, SphinxMapper
-from rtemsqual.items import Item, ItemCache, ItemGetValueContext
-from rtemsqual.specverify import NAME
+from rtemsspec.items import Item, ItemCache, ItemGetValueContext
+from rtemsspec.specverify import NAME
 
 _DocumenterMap = Dict[str, "_Documenter"]
 
diff --git a/rtemsqual/specverify.py b/rtemsspec/specverify.py
index fd26dfdc..3e6dd15e 100644
--- a/rtemsqual/specverify.py
+++ b/rtemsspec/specverify.py
@@ -28,7 +28,7 @@ import logging
 import re
 from typing import Any, Dict, List, NamedTuple, Set
 
-from rtemsqual.items import Item, ItemCache
+from rtemsspec.items import Item, ItemCache
 
 _VerifierMap = Dict[str, "_Verifier"]
 
diff --git a/rtemsqual/sphinxcontent.py b/rtemsspec/sphinxcontent.py
index c0abdd55..6247f987 100644
--- a/rtemsqual/sphinxcontent.py
+++ b/rtemsspec/sphinxcontent.py
@@ -28,8 +28,8 @@ from contextlib import contextmanager
 import re
 from typing import Any, Iterable, Iterator, List, Optional, Union
 
-from rtemsqual.content import Content, make_lines
-from rtemsqual.items import Item, ItemGetValueContext, ItemMapper
+from rtemsspec.content import Content, make_lines
+from rtemsspec.items import Item, ItemGetValueContext, ItemMapper
 
 GenericContent = Union[str, List[str], "Content"]
 GenericContentIterable = Union[Iterable[str], Iterable[List[str]],
diff --git a/rtemsqual/tests/config/a.yml b/rtemsspec/tests/config/a.yml
index 162db4e9..162db4e9 100644
--- a/rtemsqual/tests/config/a.yml
+++ b/rtemsspec/tests/config/a.yml
diff --git a/rtemsqual/tests/config/b.yml b/rtemsspec/tests/config/b.yml
index e7e2f941..e7e2f941 100644
--- a/rtemsqual/tests/config/b.yml
+++ b/rtemsspec/tests/config/b.yml
diff --git a/rtemsqual/tests/config/c/d.yml b/rtemsspec/tests/config/c/d.yml
index dd4175c8..dd4175c8 100644
--- a/rtemsqual/tests/config/c/d.yml
+++ b/rtemsspec/tests/config/c/d.yml
diff --git a/rtemsqual/tests/config/c/e.yml b/rtemsspec/tests/config/c/e.yml
index 4bcfe98e..4bcfe98e 100644
--- a/rtemsqual/tests/config/c/e.yml
+++ b/rtemsspec/tests/config/c/e.yml
diff --git a/rtemsqual/tests/spec-applconfig/a.yml b/rtemsspec/tests/spec-applconfig/a.yml
index bde070c0..bde070c0 100644
--- a/rtemsqual/tests/spec-applconfig/a.yml
+++ b/rtemsspec/tests/spec-applconfig/a.yml
diff --git a/rtemsqual/tests/spec-applconfig/b.yml b/rtemsspec/tests/spec-applconfig/b.yml
index 34b5a3c3..34b5a3c3 100644
--- a/rtemsqual/tests/spec-applconfig/b.yml
+++ b/rtemsspec/tests/spec-applconfig/b.yml
diff --git a/rtemsqual/tests/spec-applconfig/c.yml b/rtemsspec/tests/spec-applconfig/c.yml
index 61a645c4..61a645c4 100644
--- a/rtemsqual/tests/spec-applconfig/c.yml
+++ b/rtemsspec/tests/spec-applconfig/c.yml
diff --git a/rtemsqual/tests/spec-applconfig/d.yml b/rtemsspec/tests/spec-applconfig/d.yml
index 93fbd416..93fbd416 100644
--- a/rtemsqual/tests/spec-applconfig/d.yml
+++ b/rtemsspec/tests/spec-applconfig/d.yml
diff --git a/rtemsqual/tests/spec-applconfig/e.yml b/rtemsspec/tests/spec-applconfig/e.yml
index 77686aca..77686aca 100644
--- a/rtemsqual/tests/spec-applconfig/e.yml
+++ b/rtemsspec/tests/spec-applconfig/e.yml
diff --git a/rtemsqual/tests/spec-applconfig/f.yml b/rtemsspec/tests/spec-applconfig/f.yml
index 9fdb0b26..9fdb0b26 100644
--- a/rtemsqual/tests/spec-applconfig/f.yml
+++ b/rtemsspec/tests/spec-applconfig/f.yml
diff --git a/rtemsqual/tests/spec-applconfig/func.yml b/rtemsspec/tests/spec-applconfig/func.yml
index fc08ddc0..fc08ddc0 100644
--- a/rtemsqual/tests/spec-applconfig/func.yml
+++ b/rtemsspec/tests/spec-applconfig/func.yml
diff --git a/rtemsqual/tests/spec-applconfig/g.yml b/rtemsspec/tests/spec-applconfig/g.yml
index a0bccd0b..a0bccd0b 100644
--- a/rtemsqual/tests/spec-applconfig/g.yml
+++ b/rtemsspec/tests/spec-applconfig/g.yml
diff --git a/rtemsqual/tests/spec-applconfig/h.yml b/rtemsspec/tests/spec-applconfig/h.yml
index 513b49ab..513b49ab 100644
--- a/rtemsqual/tests/spec-applconfig/h.yml
+++ b/rtemsspec/tests/spec-applconfig/h.yml
diff --git a/rtemsqual/tests/spec-applconfig/i.yml b/rtemsspec/tests/spec-applconfig/i.yml
index 6d875ac0..6d875ac0 100644
--- a/rtemsqual/tests/spec-applconfig/i.yml
+++ b/rtemsspec/tests/spec-applconfig/i.yml
diff --git a/rtemsqual/tests/spec-applconfig/j.yml b/rtemsspec/tests/spec-applconfig/j.yml
index 093c9cc4..093c9cc4 100644
--- a/rtemsqual/tests/spec-applconfig/j.yml
+++ b/rtemsspec/tests/spec-applconfig/j.yml
diff --git a/rtemsqual/tests/spec-applconfig/k.yml b/rtemsspec/tests/spec-applconfig/k.yml
index 6900d41c..6900d41c 100644
--- a/rtemsqual/tests/spec-applconfig/k.yml
+++ b/rtemsspec/tests/spec-applconfig/k.yml
diff --git a/rtemsqual/tests/spec-applconfig/l.yml b/rtemsspec/tests/spec-applconfig/l.yml
index 1506dddc..1506dddc 100644
--- a/rtemsqual/tests/spec-applconfig/l.yml
+++ b/rtemsspec/tests/spec-applconfig/l.yml
diff --git a/rtemsqual/tests/spec-applconfig/m.yml b/rtemsspec/tests/spec-applconfig/m.yml
index 267f6bc4..267f6bc4 100644
--- a/rtemsqual/tests/spec-applconfig/m.yml
+++ b/rtemsspec/tests/spec-applconfig/m.yml
diff --git a/rtemsqual/tests/spec-applconfig/td.yml b/rtemsspec/tests/spec-applconfig/td.yml
index 9ef5c4fa..9ef5c4fa 100644
--- a/rtemsqual/tests/spec-applconfig/td.yml
+++ b/rtemsspec/tests/spec-applconfig/td.yml
diff --git a/rtemsqual/tests/spec-build/bsp.yml b/rtemsspec/tests/spec-build/bsp.yml
index 8e42c1b6..8e42c1b6 100644
--- a/rtemsqual/tests/spec-build/bsp.yml
+++ b/rtemsspec/tests/spec-build/bsp.yml
diff --git a/rtemsqual/tests/spec-build/bsp2.yml b/rtemsspec/tests/spec-build/bsp2.yml
index 7488559f..7488559f 100644
--- a/rtemsqual/tests/spec-build/bsp2.yml
+++ b/rtemsspec/tests/spec-build/bsp2.yml
diff --git a/rtemsqual/tests/spec-build/d.yml b/rtemsspec/tests/spec-build/d.yml
index b07f55bd..b07f55bd 100644
--- a/rtemsqual/tests/spec-build/d.yml
+++ b/rtemsspec/tests/spec-build/d.yml
diff --git a/rtemsqual/tests/spec-build/g.yml b/rtemsspec/tests/spec-build/g.yml
index de26b4d5..de26b4d5 100644
--- a/rtemsqual/tests/spec-build/g.yml
+++ b/rtemsspec/tests/spec-build/g.yml
diff --git a/rtemsqual/tests/spec-build/o.yml b/rtemsspec/tests/spec-build/o.yml
index 3b45d873..3b45d873 100644
--- a/rtemsqual/tests/spec-build/o.yml
+++ b/rtemsspec/tests/spec-build/o.yml
diff --git a/rtemsqual/tests/spec-build/s.yml b/rtemsspec/tests/spec-build/s.yml
index a0b7eae7..a0b7eae7 100644
--- a/rtemsqual/tests/spec-build/s.yml
+++ b/rtemsspec/tests/spec-build/s.yml
diff --git a/rtemsqual/tests/spec-build/x.yml b/rtemsspec/tests/spec-build/x.yml
index 26e98206..26e98206 100644
--- a/rtemsqual/tests/spec-build/x.yml
+++ b/rtemsspec/tests/spec-build/x.yml
diff --git a/rtemsqual/tests/spec-doc/a.yml b/rtemsspec/tests/spec-doc/a.yml
index 2384ae3c..2384ae3c 100644
--- a/rtemsqual/tests/spec-doc/a.yml
+++ b/rtemsspec/tests/spec-doc/a.yml
diff --git a/rtemsqual/tests/spec-doc/b.yml b/rtemsspec/tests/spec-doc/b.yml
index 7ee8daa2..7ee8daa2 100644
--- a/rtemsqual/tests/spec-doc/b.yml
+++ b/rtemsspec/tests/spec-doc/b.yml
diff --git a/rtemsqual/tests/spec-doc/c.yml b/rtemsspec/tests/spec-doc/c.yml
index 314bda78..314bda78 100644
--- a/rtemsqual/tests/spec-doc/c.yml
+++ b/rtemsspec/tests/spec-doc/c.yml
diff --git a/rtemsqual/tests/spec-doc/d.yml b/rtemsspec/tests/spec-doc/d.yml
index 38abd2ea..38abd2ea 100644
--- a/rtemsqual/tests/spec-doc/d.yml
+++ b/rtemsspec/tests/spec-doc/d.yml
diff --git a/rtemsqual/tests/spec-doc/list-only.yml b/rtemsspec/tests/spec-doc/list-only.yml
index 5cd964c7..5cd964c7 100644
--- a/rtemsqual/tests/spec-doc/list-only.yml
+++ b/rtemsspec/tests/spec-doc/list-only.yml
diff --git a/rtemsqual/tests/spec-doc/root.yml b/rtemsspec/tests/spec-doc/root.yml
index c6fa898a..c6fa898a 100644
--- a/rtemsqual/tests/spec-doc/root.yml
+++ b/rtemsspec/tests/spec-doc/root.yml
diff --git a/rtemsqual/tests/spec-glossary/doc.rst b/rtemsspec/tests/spec-glossary/doc.rst
index e07b9a35..e07b9a35 100644
--- a/rtemsqual/tests/spec-glossary/doc.rst
+++ b/rtemsspec/tests/spec-glossary/doc.rst
diff --git a/rtemsqual/tests/spec-glossary/g.yml b/rtemsspec/tests/spec-glossary/g.yml
index 86797bfc..86797bfc 100644
--- a/rtemsqual/tests/spec-glossary/g.yml
+++ b/rtemsspec/tests/spec-glossary/g.yml
diff --git a/rtemsqual/tests/spec-glossary/glossary.rst b/rtemsspec/tests/spec-glossary/glossary.rst
index e69de29b..e69de29b 100644
--- a/rtemsqual/tests/spec-glossary/glossary.rst
+++ b/rtemsspec/tests/spec-glossary/glossary.rst
diff --git a/rtemsqual/tests/spec-glossary/glossary/t.yml b/rtemsspec/tests/spec-glossary/glossary/t.yml
index 0b82d582..0b82d582 100644
--- a/rtemsqual/tests/spec-glossary/glossary/t.yml
+++ b/rtemsspec/tests/spec-glossary/glossary/t.yml
diff --git a/rtemsqual/tests/spec-glossary/glossary/u.yml b/rtemsspec/tests/spec-glossary/glossary/u.yml
index 1ce28ff8..1ce28ff8 100644
--- a/rtemsqual/tests/spec-glossary/glossary/u.yml
+++ b/rtemsspec/tests/spec-glossary/glossary/u.yml
diff --git a/rtemsqual/tests/spec-glossary/glossary/v.yml b/rtemsspec/tests/spec-glossary/glossary/v.yml
index dca475a7..dca475a7 100644
--- a/rtemsqual/tests/spec-glossary/glossary/v.yml
+++ b/rtemsspec/tests/spec-glossary/glossary/v.yml
diff --git a/rtemsqual/tests/spec-interface/asm.yml b/rtemsspec/tests/spec-interface/asm.yml
index 2d4fe860..2d4fe860 100644
--- a/rtemsqual/tests/spec-interface/asm.yml
+++ b/rtemsspec/tests/spec-interface/asm.yml
diff --git a/rtemsqual/tests/spec-interface/command-line.yml b/rtemsspec/tests/spec-interface/command-line.yml
index 5ecd875f..5ecd875f 100644
--- a/rtemsqual/tests/spec-interface/command-line.yml
+++ b/rtemsspec/tests/spec-interface/command-line.yml
diff --git a/rtemsqual/tests/spec-interface/define-a.yml b/rtemsspec/tests/spec-interface/define-a.yml
index 6078f749..6078f749 100644
--- a/rtemsqual/tests/spec-interface/define-a.yml
+++ b/rtemsspec/tests/spec-interface/define-a.yml
diff --git a/rtemsqual/tests/spec-interface/define-b.yml b/rtemsspec/tests/spec-interface/define-b.yml
index 3136db5e..3136db5e 100644
--- a/rtemsqual/tests/spec-interface/define-b.yml
+++ b/rtemsspec/tests/spec-interface/define-b.yml
diff --git a/rtemsqual/tests/spec-interface/define-c.yml b/rtemsspec/tests/spec-interface/define-c.yml
index 1a515a29..1a515a29 100644
--- a/rtemsqual/tests/spec-interface/define-c.yml
+++ b/rtemsspec/tests/spec-interface/define-c.yml
diff --git a/rtemsqual/tests/spec-interface/define.yml b/rtemsspec/tests/spec-interface/define.yml
index 2f72c770..2f72c770 100644
--- a/rtemsqual/tests/spec-interface/define.yml
+++ b/rtemsspec/tests/spec-interface/define.yml
diff --git a/rtemsqual/tests/spec-interface/domain-abc.yml b/rtemsspec/tests/spec-interface/domain-abc.yml
index e878fb8c..e878fb8c 100644
--- a/rtemsqual/tests/spec-interface/domain-abc.yml
+++ b/rtemsspec/tests/spec-interface/domain-abc.yml
diff --git a/rtemsqual/tests/spec-interface/domain-c.yml b/rtemsspec/tests/spec-interface/domain-c.yml
index 9eaea624..9eaea624 100644
--- a/rtemsqual/tests/spec-interface/domain-c.yml
+++ b/rtemsspec/tests/spec-interface/domain-c.yml
diff --git a/rtemsqual/tests/spec-interface/domain-command-line.yml b/rtemsspec/tests/spec-interface/domain-command-line.yml
index ba2a3a42..ba2a3a42 100644
--- a/rtemsqual/tests/spec-interface/domain-command-line.yml
+++ b/rtemsspec/tests/spec-interface/domain-command-line.yml
diff --git a/rtemsqual/tests/spec-interface/enum.yml b/rtemsspec/tests/spec-interface/enum.yml
index f3bcbc17..f3bcbc17 100644
--- a/rtemsqual/tests/spec-interface/enum.yml
+++ b/rtemsspec/tests/spec-interface/enum.yml
diff --git a/rtemsqual/tests/spec-interface/enum2.yml b/rtemsspec/tests/spec-interface/enum2.yml
index 54ac9c21..54ac9c21 100644
--- a/rtemsqual/tests/spec-interface/enum2.yml
+++ b/rtemsspec/tests/spec-interface/enum2.yml
diff --git a/rtemsqual/tests/spec-interface/enum3.yml b/rtemsspec/tests/spec-interface/enum3.yml
index eaaf1400..eaaf1400 100644
--- a/rtemsqual/tests/spec-interface/enum3.yml
+++ b/rtemsspec/tests/spec-interface/enum3.yml
diff --git a/rtemsqual/tests/spec-interface/enum4.yml b/rtemsspec/tests/spec-interface/enum4.yml
index 94297498..94297498 100644
--- a/rtemsqual/tests/spec-interface/enum4.yml
+++ b/rtemsspec/tests/spec-interface/enum4.yml
diff --git a/rtemsqual/tests/spec-interface/enumerator-0.yml b/rtemsspec/tests/spec-interface/enumerator-0.yml
index 7937340e..7937340e 100644
--- a/rtemsqual/tests/spec-interface/enumerator-0.yml
+++ b/rtemsspec/tests/spec-interface/enumerator-0.yml
diff --git a/rtemsqual/tests/spec-interface/enumerator-1.yml b/rtemsspec/tests/spec-interface/enumerator-1.yml
index 83840471..83840471 100644
--- a/rtemsqual/tests/spec-interface/enumerator-1.yml
+++ b/rtemsspec/tests/spec-interface/enumerator-1.yml
diff --git a/rtemsqual/tests/spec-interface/enumerator-2.yml b/rtemsspec/tests/spec-interface/enumerator-2.yml
index 7dd4e7b1..7dd4e7b1 100644
--- a/rtemsqual/tests/spec-interface/enumerator-2.yml
+++ b/rtemsspec/tests/spec-interface/enumerator-2.yml
diff --git a/rtemsqual/tests/spec-interface/enumerator-a.yml b/rtemsspec/tests/spec-interface/enumerator-a.yml
index c5018b70..c5018b70 100644
--- a/rtemsqual/tests/spec-interface/enumerator-a.yml
+++ b/rtemsspec/tests/spec-interface/enumerator-a.yml
diff --git a/rtemsqual/tests/spec-interface/enumerator-b.yml b/rtemsspec/tests/spec-interface/enumerator-b.yml
index 9bcac74f..9bcac74f 100644
--- a/rtemsqual/tests/spec-interface/enumerator-b.yml
+++ b/rtemsspec/tests/spec-interface/enumerator-b.yml
diff --git a/rtemsqual/tests/spec-interface/float_t.yml b/rtemsspec/tests/spec-interface/float_t.yml
index b390553d..b390553d 100644
--- a/rtemsqual/tests/spec-interface/float_t.yml
+++ b/rtemsspec/tests/spec-interface/float_t.yml
diff --git a/rtemsqual/tests/spec-interface/forward-decl.yml b/rtemsspec/tests/spec-interface/forward-decl.yml
index 31f104ad..31f104ad 100644
--- a/rtemsqual/tests/spec-interface/forward-decl.yml
+++ b/rtemsspec/tests/spec-interface/forward-decl.yml
diff --git a/rtemsqual/tests/spec-interface/func.yml b/rtemsspec/tests/spec-interface/func.yml
index af2f1598..af2f1598 100644
--- a/rtemsqual/tests/spec-interface/func.yml
+++ b/rtemsspec/tests/spec-interface/func.yml
diff --git a/rtemsqual/tests/spec-interface/func2.yml b/rtemsspec/tests/spec-interface/func2.yml
index 295faeac..295faeac 100644
--- a/rtemsqual/tests/spec-interface/func2.yml
+++ b/rtemsspec/tests/spec-interface/func2.yml
diff --git a/rtemsqual/tests/spec-interface/func3.yml b/rtemsspec/tests/spec-interface/func3.yml
index 28b30eb1..28b30eb1 100644
--- a/rtemsqual/tests/spec-interface/func3.yml
+++ b/rtemsspec/tests/spec-interface/func3.yml
diff --git a/rtemsqual/tests/spec-interface/func4.yml b/rtemsspec/tests/spec-interface/func4.yml
index 4e033fe9..4e033fe9 100644
--- a/rtemsqual/tests/spec-interface/func4.yml
+++ b/rtemsspec/tests/spec-interface/func4.yml
diff --git a/rtemsqual/tests/spec-interface/ga.yml b/rtemsspec/tests/spec-interface/ga.yml
index 7d934baa..7d934baa 100644
--- a/rtemsqual/tests/spec-interface/ga.yml
+++ b/rtemsspec/tests/spec-interface/ga.yml
diff --git a/rtemsqual/tests/spec-interface/gb.yml b/rtemsspec/tests/spec-interface/gb.yml
index 9a363756..9a363756 100644
--- a/rtemsqual/tests/spec-interface/gb.yml
+++ b/rtemsspec/tests/spec-interface/gb.yml
diff --git a/rtemsqual/tests/spec-interface/gc.yml b/rtemsspec/tests/spec-interface/gc.yml
index c1428b82..c1428b82 100644
--- a/rtemsqual/tests/spec-interface/gc.yml
+++ b/rtemsspec/tests/spec-interface/gc.yml
diff --git a/rtemsqual/tests/spec-interface/h.yml b/rtemsspec/tests/spec-interface/h.yml
index 0733837a..0733837a 100644
--- a/rtemsqual/tests/spec-interface/h.yml
+++ b/rtemsspec/tests/spec-interface/h.yml
diff --git a/rtemsqual/tests/spec-interface/h2.yml b/rtemsspec/tests/spec-interface/h2.yml
index 194e182e..194e182e 100644
--- a/rtemsqual/tests/spec-interface/h2.yml
+++ b/rtemsspec/tests/spec-interface/h2.yml
diff --git a/rtemsqual/tests/spec-interface/h3.yml b/rtemsspec/tests/spec-interface/h3.yml
index fc61a1a5..fc61a1a5 100644
--- a/rtemsqual/tests/spec-interface/h3.yml
+++ b/rtemsspec/tests/spec-interface/h3.yml
diff --git a/rtemsqual/tests/spec-interface/h4.yml b/rtemsspec/tests/spec-interface/h4.yml
index 6233efe5..6233efe5 100644
--- a/rtemsqual/tests/spec-interface/h4.yml
+++ b/rtemsspec/tests/spec-interface/h4.yml
diff --git a/rtemsqual/tests/spec-interface/macro.yml b/rtemsspec/tests/spec-interface/macro.yml
index a1e0e788..a1e0e788 100644
--- a/rtemsqual/tests/spec-interface/macro.yml
+++ b/rtemsspec/tests/spec-interface/macro.yml
diff --git a/rtemsqual/tests/spec-interface/macro2.yml b/rtemsspec/tests/spec-interface/macro2.yml
index 36e05169..36e05169 100644
--- a/rtemsqual/tests/spec-interface/macro2.yml
+++ b/rtemsspec/tests/spec-interface/macro2.yml
diff --git a/rtemsqual/tests/spec-interface/macro3.yml b/rtemsspec/tests/spec-interface/macro3.yml
index d99179c5..d99179c5 100644
--- a/rtemsqual/tests/spec-interface/macro3.yml
+++ b/rtemsspec/tests/spec-interface/macro3.yml
diff --git a/rtemsqual/tests/spec-interface/math.yml b/rtemsspec/tests/spec-interface/math.yml
index 020449fa..020449fa 100644
--- a/rtemsqual/tests/spec-interface/math.yml
+++ b/rtemsspec/tests/spec-interface/math.yml
diff --git a/rtemsqual/tests/spec-interface/option.yml b/rtemsspec/tests/spec-interface/option.yml
index 7580bb8e..7580bb8e 100644
--- a/rtemsqual/tests/spec-interface/option.yml
+++ b/rtemsspec/tests/spec-interface/option.yml
diff --git a/rtemsqual/tests/spec-interface/other.yml b/rtemsspec/tests/spec-interface/other.yml
index 02b17731..02b17731 100644
--- a/rtemsqual/tests/spec-interface/other.yml
+++ b/rtemsspec/tests/spec-interface/other.yml
diff --git a/rtemsqual/tests/spec-interface/other2.yml b/rtemsspec/tests/spec-interface/other2.yml
index 2678ce82..2678ce82 100644
--- a/rtemsqual/tests/spec-interface/other2.yml
+++ b/rtemsspec/tests/spec-interface/other2.yml
diff --git a/rtemsqual/tests/spec-interface/other3.yml b/rtemsspec/tests/spec-interface/other3.yml
index 2678ce82..2678ce82 100644
--- a/rtemsqual/tests/spec-interface/other3.yml
+++ b/rtemsspec/tests/spec-interface/other3.yml
diff --git a/rtemsqual/tests/spec-interface/s.yml b/rtemsspec/tests/spec-interface/s.yml
index bd040ed9..bd040ed9 100644
--- a/rtemsqual/tests/spec-interface/s.yml
+++ b/rtemsspec/tests/spec-interface/s.yml
diff --git a/rtemsqual/tests/spec-interface/smp.yml b/rtemsspec/tests/spec-interface/smp.yml
index dcf41bc0..dcf41bc0 100644
--- a/rtemsqual/tests/spec-interface/smp.yml
+++ b/rtemsspec/tests/spec-interface/smp.yml
diff --git a/rtemsqual/tests/spec-interface/stdint.yml b/rtemsspec/tests/spec-interface/stdint.yml
index 559202c3..559202c3 100644
--- a/rtemsqual/tests/spec-interface/stdint.yml
+++ b/rtemsspec/tests/spec-interface/stdint.yml
diff --git a/rtemsqual/tests/spec-interface/td.yml b/rtemsspec/tests/spec-interface/td.yml
index 42f6305e..42f6305e 100644
--- a/rtemsqual/tests/spec-interface/td.yml
+++ b/rtemsspec/tests/spec-interface/td.yml
diff --git a/rtemsqual/tests/spec-interface/td3.yml b/rtemsspec/tests/spec-interface/td3.yml
index 533976b2..533976b2 100644
--- a/rtemsqual/tests/spec-interface/td3.yml
+++ b/rtemsspec/tests/spec-interface/td3.yml
diff --git a/rtemsqual/tests/spec-interface/uint32_t.yml b/rtemsspec/tests/spec-interface/uint32_t.yml
index a15c93a6..a15c93a6 100644
--- a/rtemsqual/tests/spec-interface/uint32_t.yml
+++ b/rtemsspec/tests/spec-interface/uint32_t.yml
diff --git a/rtemsqual/tests/spec-interface/var.yml b/rtemsspec/tests/spec-interface/var.yml
index 191dbfa3..191dbfa3 100644
--- a/rtemsqual/tests/spec-interface/var.yml
+++ b/rtemsspec/tests/spec-interface/var.yml
diff --git a/rtemsqual/tests/spec-item-cache/.z.yml b/rtemsspec/tests/spec-item-cache/.z.yml
index e69de29b..e69de29b 100644
--- a/rtemsqual/tests/spec-item-cache/.z.yml
+++ b/rtemsspec/tests/spec-item-cache/.z.yml
diff --git a/rtemsqual/tests/spec-item-cache/d/c.yml b/rtemsspec/tests/spec-item-cache/d/c.yml
index f901443f..f901443f 100644
--- a/rtemsqual/tests/spec-item-cache/d/c.yml
+++ b/rtemsspec/tests/spec-item-cache/d/c.yml
diff --git a/rtemsqual/tests/spec-item-cache/empty.txt b/rtemsspec/tests/spec-item-cache/empty.txt
index e69de29b..e69de29b 100644
--- a/rtemsqual/tests/spec-item-cache/empty.txt
+++ b/rtemsspec/tests/spec-item-cache/empty.txt
diff --git a/rtemsqual/tests/spec-item-cache/p.yml b/rtemsspec/tests/spec-item-cache/p.yml
index 4c3a2964..4c3a2964 100644
--- a/rtemsqual/tests/spec-item-cache/p.yml
+++ b/rtemsspec/tests/spec-item-cache/p.yml
diff --git a/rtemsqual/tests/spec-sphinx/x.yml b/rtemsspec/tests/spec-sphinx/x.yml
index 1dd0b7c2..1dd0b7c2 100644
--- a/rtemsqual/tests/spec-sphinx/x.yml
+++ b/rtemsspec/tests/spec-sphinx/x.yml
diff --git a/rtemsqual/tests/spec-sphinx/y.yml b/rtemsspec/tests/spec-sphinx/y.yml
index 79a22535..79a22535 100644
--- a/rtemsqual/tests/spec-sphinx/y.yml
+++ b/rtemsspec/tests/spec-sphinx/y.yml
diff --git a/rtemsqual/tests/spec-validation/action2.yml b/rtemsspec/tests/spec-validation/action2.yml
index caafed70..caafed70 100644
--- a/rtemsqual/tests/spec-validation/action2.yml
+++ b/rtemsspec/tests/spec-validation/action2.yml
diff --git a/rtemsqual/tests/spec-validation/directive.yml b/rtemsspec/tests/spec-validation/directive.yml
index e8842fe3..e8842fe3 100644
--- a/rtemsqual/tests/spec-validation/directive.yml
+++ b/rtemsspec/tests/spec-validation/directive.yml
diff --git a/rtemsqual/tests/spec-validation/other.yml b/rtemsspec/tests/spec-validation/other.yml
index 112c85a5..112c85a5 100644
--- a/rtemsqual/tests/spec-validation/other.yml
+++ b/rtemsspec/tests/spec-validation/other.yml
diff --git a/rtemsqual/tests/spec-validation/other2.yml b/rtemsspec/tests/spec-validation/other2.yml
index ce9e0104..ce9e0104 100644
--- a/rtemsqual/tests/spec-validation/other2.yml
+++ b/rtemsspec/tests/spec-validation/other2.yml
diff --git a/rtemsqual/tests/spec-validation/tc.yml b/rtemsspec/tests/spec-validation/tc.yml
index bb63ea74..bb63ea74 100644
--- a/rtemsqual/tests/spec-validation/tc.yml
+++ b/rtemsspec/tests/spec-validation/tc.yml
diff --git a/rtemsqual/tests/spec-validation/tc2.yml b/rtemsspec/tests/spec-validation/tc2.yml
index df236b99..df236b99 100644
--- a/rtemsqual/tests/spec-validation/tc2.yml
+++ b/rtemsspec/tests/spec-validation/tc2.yml
diff --git a/rtemsqual/tests/spec-validation/tc3.yml b/rtemsspec/tests/spec-validation/tc3.yml
index fd946e3e..fd946e3e 100644
--- a/rtemsqual/tests/spec-validation/tc3.yml
+++ b/rtemsspec/tests/spec-validation/tc3.yml
diff --git a/rtemsqual/tests/spec-validation/tc4.yml b/rtemsspec/tests/spec-validation/tc4.yml
index d415ff79..d415ff79 100644
--- a/rtemsqual/tests/spec-validation/tc4.yml
+++ b/rtemsspec/tests/spec-validation/tc4.yml
diff --git a/rtemsqual/tests/spec-validation/tp.yml b/rtemsspec/tests/spec-validation/tp.yml
index a8b281d8..a8b281d8 100644
--- a/rtemsqual/tests/spec-validation/tp.yml
+++ b/rtemsspec/tests/spec-validation/tp.yml
diff --git a/rtemsqual/tests/spec-validation/ts.yml b/rtemsspec/tests/spec-validation/ts.yml
index ff80e8e8..ff80e8e8 100644
--- a/rtemsqual/tests/spec-validation/ts.yml
+++ b/rtemsspec/tests/spec-validation/ts.yml
diff --git a/rtemsqual/tests/spec-verify/c1.yml b/rtemsspec/tests/spec-verify/c1.yml
index ac9caf74..ac9caf74 100644
--- a/rtemsqual/tests/spec-verify/c1.yml
+++ b/rtemsspec/tests/spec-verify/c1.yml
diff --git a/rtemsqual/tests/spec-verify/c2.yml b/rtemsspec/tests/spec-verify/c2.yml
index 5ea57f13..5ea57f13 100644
--- a/rtemsqual/tests/spec-verify/c2.yml
+++ b/rtemsspec/tests/spec-verify/c2.yml
diff --git a/rtemsqual/tests/spec-verify/c3.yml b/rtemsspec/tests/spec-verify/c3.yml
index 9a427110..9a427110 100644
--- a/rtemsqual/tests/spec-verify/c3.yml
+++ b/rtemsspec/tests/spec-verify/c3.yml
diff --git a/rtemsqual/tests/spec-verify/c4.yml b/rtemsspec/tests/spec-verify/c4.yml
index e0195f37..e0195f37 100644
--- a/rtemsqual/tests/spec-verify/c4.yml
+++ b/rtemsspec/tests/spec-verify/c4.yml
diff --git a/rtemsqual/tests/spec-verify/d.yml b/rtemsspec/tests/spec-verify/d.yml
index 68f65b9c..68f65b9c 100644
--- a/rtemsqual/tests/spec-verify/d.yml
+++ b/rtemsspec/tests/spec-verify/d.yml
diff --git a/rtemsqual/tests/spec-verify/d2.yml b/rtemsspec/tests/spec-verify/d2.yml
index 488487d1..488487d1 100644
--- a/rtemsqual/tests/spec-verify/d2.yml
+++ b/rtemsspec/tests/spec-verify/d2.yml
diff --git a/rtemsqual/tests/spec-verify/d3.yml b/rtemsspec/tests/spec-verify/d3.yml
index 06b30dad..06b30dad 100644
--- a/rtemsqual/tests/spec-verify/d3.yml
+++ b/rtemsspec/tests/spec-verify/d3.yml
diff --git a/rtemsqual/tests/spec-verify/e.yml b/rtemsspec/tests/spec-verify/e.yml
index b7527dee..b7527dee 100644
--- a/rtemsqual/tests/spec-verify/e.yml
+++ b/rtemsspec/tests/spec-verify/e.yml
diff --git a/rtemsqual/tests/spec-verify/invalid.yml b/rtemsspec/tests/spec-verify/invalid.yml
index 3c193f78..3c193f78 100644
--- a/rtemsqual/tests/spec-verify/invalid.yml
+++ b/rtemsspec/tests/spec-verify/invalid.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-least-one-0.yml b/rtemsspec/tests/spec-verify/keys-at-least-one-0.yml
index 8f9e4b5d..8f9e4b5d 100644
--- a/rtemsqual/tests/spec-verify/keys-at-least-one-0.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-least-one-0.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-least-one-1.yml b/rtemsspec/tests/spec-verify/keys-at-least-one-1.yml
index 31d17a4e..31d17a4e 100644
--- a/rtemsqual/tests/spec-verify/keys-at-least-one-1.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-least-one-1.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-least-one-2.yml b/rtemsspec/tests/spec-verify/keys-at-least-one-2.yml
index d0eb8a29..d0eb8a29 100644
--- a/rtemsqual/tests/spec-verify/keys-at-least-one-2.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-least-one-2.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-most-one-0.yml b/rtemsspec/tests/spec-verify/keys-at-most-one-0.yml
index 2e3f0202..2e3f0202 100644
--- a/rtemsqual/tests/spec-verify/keys-at-most-one-0.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-most-one-0.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-most-one-1.yml b/rtemsspec/tests/spec-verify/keys-at-most-one-1.yml
index e2003342..e2003342 100644
--- a/rtemsqual/tests/spec-verify/keys-at-most-one-1.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-most-one-1.yml
diff --git a/rtemsqual/tests/spec-verify/keys-at-most-one-2.yml b/rtemsspec/tests/spec-verify/keys-at-most-one-2.yml
index 88ee2aaa..88ee2aaa 100644
--- a/rtemsqual/tests/spec-verify/keys-at-most-one-2.yml
+++ b/rtemsspec/tests/spec-verify/keys-at-most-one-2.yml
diff --git a/rtemsqual/tests/spec-verify/keys-exactly-one-0.yml b/rtemsspec/tests/spec-verify/keys-exactly-one-0.yml
index 1a052978..1a052978 100644
--- a/rtemsqual/tests/spec-verify/keys-exactly-one-0.yml
+++ b/rtemsspec/tests/spec-verify/keys-exactly-one-0.yml
diff --git a/rtemsqual/tests/spec-verify/keys-exactly-one-1.yml b/rtemsspec/tests/spec-verify/keys-exactly-one-1.yml
index 2f233dd8..2f233dd8 100644
--- a/rtemsqual/tests/spec-verify/keys-exactly-one-1.yml
+++ b/rtemsspec/tests/spec-verify/keys-exactly-one-1.yml
diff --git a/rtemsqual/tests/spec-verify/keys-exactly-one-2.yml b/rtemsspec/tests/spec-verify/keys-exactly-one-2.yml
index 6226ec51..6226ec51 100644
--- a/rtemsqual/tests/spec-verify/keys-exactly-one-2.yml
+++ b/rtemsspec/tests/spec-verify/keys-exactly-one-2.yml
diff --git a/rtemsqual/tests/spec-verify/notype.yml b/rtemsspec/tests/spec-verify/notype.yml
index 8da253c5..8da253c5 100644
--- a/rtemsqual/tests/spec-verify/notype.yml
+++ b/rtemsspec/tests/spec-verify/notype.yml
diff --git a/rtemsqual/tests/spec-verify/spec/copyright.yml b/rtemsspec/tests/spec-verify/spec/copyright.yml
index a8f46080..a8f46080 100644
--- a/rtemsqual/tests/spec-verify/spec/copyright.yml
+++ b/rtemsspec/tests/spec-verify/spec/copyright.yml
diff --git a/rtemsqual/tests/spec-verify/spec/copyrights.yml b/rtemsspec/tests/spec-verify/spec/copyrights.yml
index 522e4f43..522e4f43 100644
--- a/rtemsqual/tests/spec-verify/spec/copyrights.yml
+++ b/rtemsspec/tests/spec-verify/spec/copyrights.yml
diff --git a/rtemsqual/tests/spec-verify/spec/enabled-by-list.yml b/rtemsspec/tests/spec-verify/spec/enabled-by-list.yml
index f84fff28..f84fff28 100644
--- a/rtemsqual/tests/spec-verify/spec/enabled-by-list.yml
+++ b/rtemsspec/tests/spec-verify/spec/enabled-by-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec/enabled-by.yml b/rtemsspec/tests/spec-verify/spec/enabled-by.yml
index 2f3bb287..2f3bb287 100644
--- a/rtemsqual/tests/spec-verify/spec/enabled-by.yml
+++ b/rtemsspec/tests/spec-verify/spec/enabled-by.yml
diff --git a/rtemsqual/tests/spec-verify/spec/link.yml b/rtemsspec/tests/spec-verify/spec/link.yml
index c9dadb7f..c9dadb7f 100644
--- a/rtemsqual/tests/spec-verify/spec/link.yml
+++ b/rtemsspec/tests/spec-verify/spec/link.yml
diff --git a/rtemsqual/tests/spec-verify/spec/links.yml b/rtemsspec/tests/spec-verify/spec/links.yml
index 77092dfa..77092dfa 100644
--- a/rtemsqual/tests/spec-verify/spec/links.yml
+++ b/rtemsspec/tests/spec-verify/spec/links.yml
diff --git a/rtemsqual/tests/spec-verify/spec/list-str.yml b/rtemsspec/tests/spec-verify/spec/list-str.yml
index 4d1246fb..4d1246fb 100644
--- a/rtemsqual/tests/spec-verify/spec/list-str.yml
+++ b/rtemsspec/tests/spec-verify/spec/list-str.yml
diff --git a/rtemsqual/tests/spec-verify/spec/optional-str.yml b/rtemsspec/tests/spec-verify/spec/optional-str.yml
index 3f409247..3f409247 100644
--- a/rtemsqual/tests/spec-verify/spec/optional-str.yml
+++ b/rtemsspec/tests/spec-verify/spec/optional-str.yml
diff --git a/rtemsqual/tests/spec-verify/spec/root.yml b/rtemsspec/tests/spec-verify/spec/root.yml
index 466d01a2..466d01a2 100644
--- a/rtemsqual/tests/spec-verify/spec/root.yml
+++ b/rtemsspec/tests/spec-verify/spec/root.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spdx-license-identifier.yml b/rtemsspec/tests/spec-verify/spec/spdx-license-identifier.yml
index 380b61bc..380b61bc 100644
--- a/rtemsqual/tests/spec-verify/spec/spdx-license-identifier.yml
+++ b/rtemsspec/tests/spec-verify/spec/spdx-license-identifier.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-float-list.yml
index 30addf5c..30addf5c 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-float-list.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-float-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-float.yml
index fd6f2564..fd6f2564 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-float.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-float.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-int-list.yml
index 98f20673..98f20673 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-int-list.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-int-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-int.yml
index ec903b80..ec903b80 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-int.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-int.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-str-list.yml
index 290c0bd9..290c0bd9 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-str-list.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-str-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml b/rtemsspec/tests/spec-verify/spec/spec-assert-str.yml
index 915da6ed..915da6ed 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-assert-str.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-assert-str.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml b/rtemsspec/tests/spec-verify/spec/spec-attribute-value.yml
index d44e2256..d44e2256 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-attribute-value.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-attribute-value.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-attributes.yml b/rtemsspec/tests/spec-verify/spec/spec-attributes.yml
index eb489783..eb489783 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-attributes.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-attributes.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-bool.yml b/rtemsspec/tests/spec-verify/spec/spec-bool.yml
index e23f3b1f..e23f3b1f 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-bool.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-bool.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-dict.yml b/rtemsspec/tests/spec-verify/spec/spec-dict.yml
index 1fae4d15..1fae4d15 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-dict.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-dict.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-float.yml b/rtemsspec/tests/spec-verify/spec/spec-float.yml
index 1f831eb8..1f831eb8 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-float.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-float.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml b/rtemsspec/tests/spec-verify/spec/spec-generic-attributes.yml
index 8f9b4180..8f9b4180 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-generic-attributes.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-generic-attributes.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-info.yml b/rtemsspec/tests/spec-verify/spec/spec-info.yml
index 5bdbeee0..5bdbeee0 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-info.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-info.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-int.yml b/rtemsspec/tests/spec-verify/spec/spec-int.yml
index 080a3a9d..080a3a9d 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-int.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-int.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-list.yml b/rtemsspec/tests/spec-verify/spec/spec-list.yml
index b8f87807..b8f87807 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-list.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-mandatory-attributes.yml b/rtemsspec/tests/spec-verify/spec/spec-mandatory-attributes.yml
index 700de958..700de958 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-mandatory-attributes.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-mandatory-attributes.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-member.yml b/rtemsspec/tests/spec-verify/spec/spec-member.yml
index 790500ef..790500ef 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-member.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-member.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-refinement.yml b/rtemsspec/tests/spec-verify/spec/spec-refinement.yml
index 8fd16da1..8fd16da1 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-refinement.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-refinement.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec-str.yml b/rtemsspec/tests/spec-verify/spec/spec-str.yml
index f83dae5e..f83dae5e 100644
--- a/rtemsqual/tests/spec-verify/spec/spec-str.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec-str.yml
diff --git a/rtemsqual/tests/spec-verify/spec/spec.yml b/rtemsspec/tests/spec-verify/spec/spec.yml
index e67e920e..e67e920e 100644
--- a/rtemsqual/tests/spec-verify/spec/spec.yml
+++ b/rtemsspec/tests/spec-verify/spec/spec.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/any-dict.yml b/rtemsspec/tests/spec-verify/spec2/any-dict.yml
index 1f1176d9..1f1176d9 100644
--- a/rtemsqual/tests/spec-verify/spec2/any-dict.yml
+++ b/rtemsspec/tests/spec-verify/spec2/any-dict.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/c.yml b/rtemsspec/tests/spec-verify/spec2/c.yml
index 4154288c..4154288c 100644
--- a/rtemsqual/tests/spec-verify/spec2/c.yml
+++ b/rtemsspec/tests/spec-verify/spec2/c.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/d-a.yml b/rtemsspec/tests/spec-verify/spec2/d-a.yml
index e011310d..e011310d 100644
--- a/rtemsqual/tests/spec-verify/spec2/d-a.yml
+++ b/rtemsspec/tests/spec-verify/spec2/d-a.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/d.yml b/rtemsspec/tests/spec-verify/spec2/d.yml
index 27089960..27089960 100644
--- a/rtemsqual/tests/spec-verify/spec2/d.yml
+++ b/rtemsspec/tests/spec-verify/spec2/d.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/invalid.yml b/rtemsspec/tests/spec-verify/spec2/invalid.yml
index a38e724f..a38e724f 100644
--- a/rtemsqual/tests/spec-verify/spec2/invalid.yml
+++ b/rtemsspec/tests/spec-verify/spec2/invalid.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml b/rtemsspec/tests/spec-verify/spec2/keys-at-least-one.yml
index 2336efe1..2336efe1 100644
--- a/rtemsqual/tests/spec-verify/spec2/keys-at-least-one.yml
+++ b/rtemsspec/tests/spec-verify/spec2/keys-at-least-one.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml b/rtemsspec/tests/spec-verify/spec2/keys-at-most-one.yml
index b8fb29c5..b8fb29c5 100644
--- a/rtemsqual/tests/spec-verify/spec2/keys-at-most-one.yml
+++ b/rtemsspec/tests/spec-verify/spec2/keys-at-most-one.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml b/rtemsspec/tests/spec-verify/spec2/keys-exactly-one.yml
index c546d574..c546d574 100644
--- a/rtemsqual/tests/spec-verify/spec2/keys-exactly-one.yml
+++ b/rtemsspec/tests/spec-verify/spec2/keys-exactly-one.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/must-be-true.yml b/rtemsspec/tests/spec-verify/spec2/must-be-true.yml
index eaf0ea14..eaf0ea14 100644
--- a/rtemsqual/tests/spec-verify/spec2/must-be-true.yml
+++ b/rtemsspec/tests/spec-verify/spec2/must-be-true.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/other-int.yml b/rtemsspec/tests/spec-verify/spec2/other-int.yml
index f0209c08..f0209c08 100644
--- a/rtemsqual/tests/spec-verify/spec2/other-int.yml
+++ b/rtemsspec/tests/spec-verify/spec2/other-int.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-bool.yml b/rtemsspec/tests/spec-verify/spec2/some-bool.yml
index 3204d479..3204d479 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-bool.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-bool.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-dict.yml b/rtemsspec/tests/spec-verify/spec2/some-dict.yml
index c0bd51b8..c0bd51b8 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-dict.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-dict.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-float.yml b/rtemsspec/tests/spec-verify/spec2/some-float.yml
index 114f6feb..114f6feb 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-float.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-float.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-int.yml b/rtemsspec/tests/spec-verify/spec2/some-int.yml
index 8f59d8a1..8f59d8a1 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-int.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-int.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-list.yml b/rtemsspec/tests/spec-verify/spec2/some-list.yml
index b3b45086..b3b45086 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-list.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-list.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/some-str.yml b/rtemsspec/tests/spec-verify/spec2/some-str.yml
index c75aaf10..c75aaf10 100644
--- a/rtemsqual/tests/spec-verify/spec2/some-str.yml
+++ b/rtemsspec/tests/spec-verify/spec2/some-str.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/sta.yml b/rtemsspec/tests/spec-verify/spec2/sta.yml
index 1c70a1ce..1c70a1ce 100644
--- a/rtemsqual/tests/spec-verify/spec2/sta.yml
+++ b/rtemsspec/tests/spec-verify/spec2/sta.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/str-contains.yml b/rtemsspec/tests/spec-verify/spec2/str-contains.yml
index fbd7b856..fbd7b856 100644
--- a/rtemsqual/tests/spec-verify/spec2/str-contains.yml
+++ b/rtemsspec/tests/spec-verify/spec2/str-contains.yml
diff --git a/rtemsqual/tests/spec-verify/spec2/x.yml b/rtemsspec/tests/spec-verify/spec2/x.yml
index e96d281a..e96d281a 100644
--- a/rtemsqual/tests/spec-verify/spec2/x.yml
+++ b/rtemsspec/tests/spec-verify/spec2/x.yml
diff --git a/rtemsqual/tests/spec/build-more.yml b/rtemsspec/tests/spec/build-more.yml
index fb35b357..fb35b357 100644
--- a/rtemsqual/tests/spec/build-more.yml
+++ b/rtemsspec/tests/spec/build-more.yml
diff --git a/rtemsqual/tests/spec/build.yml b/rtemsspec/tests/spec/build.yml
index 8329c6d4..8329c6d4 100644
--- a/rtemsqual/tests/spec/build.yml
+++ b/rtemsspec/tests/spec/build.yml
diff --git a/rtemsqual/tests/spec/constraint.yml b/rtemsspec/tests/spec/constraint.yml
index 5e6af544..5e6af544 100644
--- a/rtemsqual/tests/spec/constraint.yml
+++ b/rtemsspec/tests/spec/constraint.yml
diff --git a/rtemsqual/tests/spec/functional-more.yml b/rtemsspec/tests/spec/functional-more.yml
index dee60872..dee60872 100644
--- a/rtemsqual/tests/spec/functional-more.yml
+++ b/rtemsspec/tests/spec/functional-more.yml
diff --git a/rtemsqual/tests/spec/functional.yml b/rtemsspec/tests/spec/functional.yml
index 9ae9cfec..9ae9cfec 100644
--- a/rtemsqual/tests/spec/functional.yml
+++ b/rtemsspec/tests/spec/functional.yml
diff --git a/rtemsqual/tests/spec/glossary-more.yml b/rtemsspec/tests/spec/glossary-more.yml
index bbcad8c3..bbcad8c3 100644
--- a/rtemsqual/tests/spec/glossary-more.yml
+++ b/rtemsspec/tests/spec/glossary-more.yml
diff --git a/rtemsqual/tests/spec/glossary.yml b/rtemsspec/tests/spec/glossary.yml
index 6a34d364..6a34d364 100644
--- a/rtemsqual/tests/spec/glossary.yml
+++ b/rtemsspec/tests/spec/glossary.yml
diff --git a/rtemsqual/tests/spec/interface-appl-config-more.yml b/rtemsspec/tests/spec/interface-appl-config-more.yml
index 8a8ecc56..8a8ecc56 100644
--- a/rtemsqual/tests/spec/interface-appl-config-more.yml
+++ b/rtemsspec/tests/spec/interface-appl-config-more.yml
diff --git a/rtemsqual/tests/spec/interface-appl-config-option.yml b/rtemsspec/tests/spec/interface-appl-config-option.yml
index bb6997b7..bb6997b7 100644
--- a/rtemsqual/tests/spec/interface-appl-config-option.yml
+++ b/rtemsspec/tests/spec/interface-appl-config-option.yml
diff --git a/rtemsqual/tests/spec/interface-more.yml b/rtemsspec/tests/spec/interface-more.yml
index deaf1e60..deaf1e60 100644
--- a/rtemsqual/tests/spec/interface-more.yml
+++ b/rtemsspec/tests/spec/interface-more.yml
diff --git a/rtemsqual/tests/spec/interface.yml b/rtemsspec/tests/spec/interface.yml
index 99ba9ac5..99ba9ac5 100644
--- a/rtemsqual/tests/spec/interface.yml
+++ b/rtemsspec/tests/spec/interface.yml
diff --git a/rtemsqual/tests/spec/other.yml b/rtemsspec/tests/spec/other.yml
index ae7b8770..ae7b8770 100644
--- a/rtemsqual/tests/spec/other.yml
+++ b/rtemsspec/tests/spec/other.yml
diff --git a/rtemsqual/tests/spec/requirement.yml b/rtemsspec/tests/spec/requirement.yml
index 72efb21c..72efb21c 100644
--- a/rtemsqual/tests/spec/requirement.yml
+++ b/rtemsspec/tests/spec/requirement.yml
diff --git a/rtemsqual/tests/spec/root.yml b/rtemsspec/tests/spec/root.yml
index 4c3ea506..4c3ea506 100644
--- a/rtemsqual/tests/spec/root.yml
+++ b/rtemsspec/tests/spec/root.yml
diff --git a/rtemsqual/tests/spec/spec.yml b/rtemsspec/tests/spec/spec.yml
index b4e42b2e..b4e42b2e 100644
--- a/rtemsqual/tests/spec/spec.yml
+++ b/rtemsspec/tests/spec/spec.yml
diff --git a/rtemsqual/tests/spec/test-case.yml b/rtemsspec/tests/spec/test-case.yml
index 9eeeb674..9eeeb674 100644
--- a/rtemsqual/tests/spec/test-case.yml
+++ b/rtemsspec/tests/spec/test-case.yml
diff --git a/rtemsqual/tests/spec/test-suite.yml b/rtemsspec/tests/spec/test-suite.yml
index 8818c410..8818c410 100644
--- a/rtemsqual/tests/spec/test-suite.yml
+++ b/rtemsspec/tests/spec/test-suite.yml
diff --git a/rtemsqual/tests/test_applconfig.py b/rtemsspec/tests/test_applconfig.py
index 06d9de59..e98db813 100644
--- a/rtemsqual/tests/test_applconfig.py
+++ b/rtemsspec/tests/test_applconfig.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.applconfig module. """
+""" Unit tests for the rtemsspec.applconfig module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,9 +26,9 @@
 
 import os
 
-from rtemsqual.applconfig import generate
-from rtemsqual.items import ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.applconfig import generate
+from rtemsspec.items import ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_applconfig(tmpdir):
diff --git a/rtemsqual/tests/test_build.py b/rtemsspec/tests/test_build.py
index f62449e1..28e971fb 100644
--- a/rtemsqual/tests/test_build.py
+++ b/rtemsspec/tests/test_build.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.build module. """
+""" Unit tests for the rtemsspec.build module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -24,9 +24,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from rtemsqual.build import gather_files
-from rtemsqual.items import ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.build import gather_files
+from rtemsspec.items import ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_build(tmpdir):
diff --git a/rtemsqual/tests/test_content.py b/rtemsspec/tests/test_content.py
index b18909da..27118e1a 100644
--- a/rtemsqual/tests/test_content.py
+++ b/rtemsspec/tests/test_content.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.content module. """
+""" Unit tests for the rtemsspec.content module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,7 +27,7 @@
 import os
 import pytest
 
-from rtemsqual.content import Content, enabled_by_to_exp, \
+from rtemsspec.content import Content, enabled_by_to_exp, \
     ExpressionMapper, PythonExpressionMapper
 
 
diff --git a/rtemsqual/tests/test_content_c.py b/rtemsspec/tests/test_content_c.py
index 3c12d936..81f15727 100644
--- a/rtemsqual/tests/test_content_c.py
+++ b/rtemsspec/tests/test_content_c.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.content module. """
+""" Unit tests for the rtemsspec.content module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,7 +26,7 @@
 
 import pytest
 
-from rtemsqual.content import CContent, CInclude
+from rtemsspec.content import CContent, CInclude
 
 
 def test_doxyfy():
diff --git a/rtemsqual/tests/test_content_copyrights.py b/rtemsspec/tests/test_content_copyrights.py
index cab67f8d..b92c06bc 100644
--- a/rtemsqual/tests/test_content_copyrights.py
+++ b/rtemsspec/tests/test_content_copyrights.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.content module. """
+""" Unit tests for the rtemsspec.content module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,8 +26,8 @@
 
 import pytest
 
-from rtemsqual.content import Copyright
-from rtemsqual.content import Copyrights
+from rtemsspec.content import Copyright
+from rtemsspec.content import Copyrights
 
 
 def test_copyright_get_statement():
diff --git a/rtemsqual/tests/test_content_sphinx.py b/rtemsspec/tests/test_content_sphinx.py
index 50552410..6581b173 100644
--- a/rtemsqual/tests/test_content_sphinx.py
+++ b/rtemsspec/tests/test_content_sphinx.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.sphinxcontent module. """
+""" Unit tests for the rtemsspec.sphinxcontent module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,10 +26,10 @@
 
 import pytest
 
-from rtemsqual.sphinxcontent import get_reference, get_label, \
+from rtemsspec.sphinxcontent import get_reference, get_label, \
     SphinxContent, SphinxMapper
-from rtemsqual.items import Item, ItemCache, ItemMapper
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.items import Item, ItemCache, ItemMapper
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_add_label():
diff --git a/rtemsqual/tests/test_glossary.py b/rtemsspec/tests/test_glossary.py
index 65113540..2682b5da 100644
--- a/rtemsqual/tests/test_glossary.py
+++ b/rtemsspec/tests/test_glossary.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.glossary module. """
+""" Unit tests for the rtemsspec.glossary module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,9 +26,9 @@
 
 import os
 
-from rtemsqual.glossary import generate
-from rtemsqual.items import ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.glossary import generate
+from rtemsspec.items import ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_glossary(tmpdir):
diff --git a/rtemsqual/tests/test_interface.py b/rtemsspec/tests/test_interface.py
index 8415ba75..c6aa625b 100644
--- a/rtemsqual/tests/test_interface.py
+++ b/rtemsspec/tests/test_interface.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.interface module. """
+""" Unit tests for the rtemsspec.interface module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,9 +27,9 @@
 import os
 import pytest
 
-from rtemsqual.interface import generate
-from rtemsqual.items import EmptyItemCache, ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.interface import generate
+from rtemsspec.items import EmptyItemCache, ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_interface(tmpdir):
diff --git a/rtemsqual/tests/test_interfacedoc.py b/rtemsspec/tests/test_interfacedoc.py
index f68e9587..b9948fc8 100644
--- a/rtemsqual/tests/test_interfacedoc.py
+++ b/rtemsspec/tests/test_interfacedoc.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.interfacedoc module. """
+""" Unit tests for the rtemsspec.interfacedoc module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,9 +27,9 @@
 import os
 import pytest
 
-from rtemsqual.interfacedoc import generate
-from rtemsqual.items import EmptyItemCache, ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.interfacedoc import generate
+from rtemsspec.items import EmptyItemCache, ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_interfacedoc(tmpdir):
diff --git a/rtemsqual/tests/test_items_item.py b/rtemsspec/tests/test_items_item.py
index 68ab7169..511349ab 100644
--- a/rtemsqual/tests/test_items_item.py
+++ b/rtemsspec/tests/test_items_item.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.items module. """
+""" Unit tests for the rtemsspec.items module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,7 +27,7 @@
 import os
 import pytest
 
-from rtemsqual.items import EmptyItemCache, Item, ItemCache, Link
+from rtemsspec.items import EmptyItemCache, Item, ItemCache, Link
 
 
 def test_to_abs_uid():
diff --git a/rtemsqual/tests/test_items_itemcache.py b/rtemsspec/tests/test_items_itemcache.py
index c65f4f42..678ae2b2 100644
--- a/rtemsqual/tests/test_items_itemcache.py
+++ b/rtemsspec/tests/test_items_itemcache.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.items module. """
+""" Unit tests for the rtemsspec.items module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,8 +27,8 @@
 import os
 import pytest
 
-from rtemsqual.items import EmptyItem, ItemCache, ItemMapper, ItemTemplate
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.items import EmptyItem, ItemCache, ItemMapper, ItemTemplate
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_config_error():
diff --git a/rtemsqual/tests/test_specdoc.py b/rtemsspec/tests/test_specdoc.py
index 6c18571a..0ac432e9 100644
--- a/rtemsqual/tests/test_specdoc.py
+++ b/rtemsspec/tests/test_specdoc.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.specdoc module. """
+""" Unit tests for the rtemsspec.specdoc module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,9 +26,9 @@
 
 import os
 
-from rtemsqual.items import ItemCache
-from rtemsqual.specdoc import document
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.items import ItemCache
+from rtemsspec.specdoc import document
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_document(tmpdir):
diff --git a/rtemsqual/tests/test_specverify.py b/rtemsspec/tests/test_specverify.py
index b46b493d..076a6fab 100644
--- a/rtemsqual/tests/test_specverify.py
+++ b/rtemsspec/tests/test_specverify.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.specverify module. """
+""" Unit tests for the rtemsspec.specverify module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,9 +26,9 @@
 
 import logging
 
-from rtemsqual.items import ItemCache
-from rtemsqual.specverify import verify
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.items import ItemCache
+from rtemsspec.specverify import verify
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_no_root_type(caplog, tmpdir):
diff --git a/rtemsqual/tests/test_util.py b/rtemsspec/tests/test_util.py
index e332ab8d..c85e6833 100644
--- a/rtemsqual/tests/test_util.py
+++ b/rtemsspec/tests/test_util.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.util module. """
+""" Unit tests for the rtemsspec.util module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -26,7 +26,7 @@
 
 import os
 
-from rtemsqual.util import copy_files, load_config
+from rtemsspec.util import copy_files, load_config
 
 
 def test_copy_files(tmpdir):
diff --git a/rtemsqual/tests/test_validation.py b/rtemsspec/tests/test_validation.py
index 209e8268..d2a79f8c 100644
--- a/rtemsqual/tests/test_validation.py
+++ b/rtemsspec/tests/test_validation.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-2-Clause
-""" Unit tests for the rtemsqual.validation module. """
+""" Unit tests for the rtemsspec.validation module. """
 
 # Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 #
@@ -27,9 +27,9 @@
 import os
 import pytest
 
-from rtemsqual.validation import generate
-from rtemsqual.items import EmptyItemCache, ItemCache
-from rtemsqual.tests.util import create_item_cache_config_and_copy_spec
+from rtemsspec.validation import generate
+from rtemsspec.items import EmptyItemCache, ItemCache
+from rtemsspec.tests.util import create_item_cache_config_and_copy_spec
 
 
 def test_validation(tmpdir):
diff --git a/rtemsqual/tests/util.py b/rtemsspec/tests/util.py
index d07df74c..d07df74c 100644
--- a/rtemsqual/tests/util.py
+++ b/rtemsspec/tests/util.py
diff --git a/rtemsqual/util.py b/rtemsspec/util.py
index d2403cd3..d2403cd3 100644
--- a/rtemsqual/util.py
+++ b/rtemsspec/util.py
diff --git a/rtemsqual/validation.py b/rtemsspec/validation.py
index 00171623..d2d5a500 100644
--- a/rtemsqual/validation.py
+++ b/rtemsspec/validation.py
@@ -28,9 +28,9 @@ import itertools
 import os
 from typing import Any, Dict, List, NamedTuple, Optional, Tuple
 
-from rtemsqual.content import CContent, CInclude, enabled_by_to_exp, \
+from rtemsspec.content import CContent, CInclude, enabled_by_to_exp, \
     ExpressionMapper
-from rtemsqual.items import Item, ItemCache, ItemGetValueContext, ItemMapper
+from rtemsspec.items import Item, ItemCache, ItemGetValueContext, ItemMapper
 
 ItemMap = Dict[str, Item]
 
diff --git a/spec2doc.py b/spec2doc.py
index bc118796..bf36c584 100755
--- a/spec2doc.py
+++ b/spec2doc.py
@@ -25,17 +25,17 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import rtemsqual
+import rtemsspec
 
 
 def main() -> None:
     """ Generates files of the RTEMS documentation from the specification. """
-    config = rtemsqual.util.load_config("config.yml")
-    item_cache = rtemsqual.items.ItemCache(config["spec"])
-    rtemsqual.applconfig.generate(config["appl-config"], item_cache)
-    rtemsqual.specdoc.document(config["spec-documentation"], item_cache)
-    rtemsqual.glossary.generate(config["glossary"], item_cache)
-    rtemsqual.interfacedoc.generate(config["interface-documentation"],
+    config = rtemsspec.util.load_config("config.yml")
+    item_cache = rtemsspec.items.ItemCache(config["spec"])
+    rtemsspec.applconfig.generate(config["appl-config"], item_cache)
+    rtemsspec.specdoc.document(config["spec-documentation"], item_cache)
+    rtemsspec.glossary.generate(config["glossary"], item_cache)
+    rtemsspec.interfacedoc.generate(config["interface-documentation"],
                                     item_cache)
 
 
diff --git a/spec2rtems.py b/spec2rtems.py
index 878b79a4..f4939998 100755
--- a/spec2rtems.py
+++ b/spec2rtems.py
@@ -25,15 +25,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import rtemsqual
+import rtemsspec
 
 
 def main() -> None:
     """ Generates files of the RTEMS sources from the specification. """
-    config = rtemsqual.util.load_config("config.yml")
-    item_cache = rtemsqual.items.ItemCache(config["spec"])
-    rtemsqual.interface.generate(config["interface"], item_cache)
-    rtemsqual.validation.generate(config["validation"], item_cache)
+    config = rtemsspec.util.load_config("config.yml")
+    item_cache = rtemsspec.items.ItemCache(config["spec"])
+    rtemsspec.interface.generate(config["interface"], item_cache)
+    rtemsspec.validation.generate(config["validation"], item_cache)
 
 
 if __name__ == "__main__":
diff --git a/specverify.py b/specverify.py
index a5033386..6effacb1 100755
--- a/specverify.py
+++ b/specverify.py
@@ -25,16 +25,16 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import rtemsqual.items
-import rtemsqual.specverify
-import rtemsqual.util
+import rtemsspec.items
+import rtemsspec.specverify
+import rtemsspec.util
 
 
 def main() -> None:
     """ Verfies the specification. """
-    config = rtemsqual.util.load_config("config.yml")
-    item_cache = rtemsqual.items.ItemCache(config["spec"])
-    rtemsqual.specverify.verify(config["spec-verification"], item_cache)
+    config = rtemsspec.util.load_config("config.yml")
+    item_cache = rtemsspec.items.ItemCache(config["spec"])
+    rtemsspec.specverify.verify(config["spec-verification"], item_cache)
 
 
 if __name__ == "__main__":