diff --git a/docs/annexes/rdf-model.md b/docs/annexes/rdf-model.md
index 89accf20b6..c26c8577b5 100644
--- a/docs/annexes/rdf-model.md
+++ b/docs/annexes/rdf-model.md
@@ -8,9 +8,13 @@ and is published in online at
 
 ## Diagrams
 
-### Core and Software Profiles
+### Core Profile
 
-[![Core and Software Profiles diagram][fig_core_software]][fig_core_software]
+[![Core Profile diagram][fig_core]][fig_core]
+
+### Software Profile
+
+[![Software Profile diagram][fig_software]][fig_software]
 
 ### Security Profile
 
@@ -36,10 +40,11 @@ and is published in online at
 
 [![Extension Profile diagram][fig_extension]][fig_extension]
 
-[fig_ai]: ../images/model-ai.png "SPDX 3.0.1 AI Profile diagram"
-[fig_build]: ../images/model-build.png "SPDX 3.0.1 Build Profile diagram"
-[fig_core_software]: ../images/model-core-software.png "SPDX 3.0.1 Core and Software Profiles diagram"
-[fig_dataset]: ../images/model-dataset.png "SPDX 3.0.1 Dataset Profile diagram"
-[fig_extension]: ../images/model-extension.png "SPDX 3.0.1 Extension Profile diagram"
-[fig_licensing]: ../images/model-licensing.png "SPDX 3.0.1 Licensing Profile diagram"
-[fig_security]: ../images/model-security.png "SPDX 3.0.1 Security Profile diagram"
+[fig_ai]: ../images/model-AI.png "SPDX 3.0.1 AI Profile diagram"
+[fig_build]: ../images/model-Build.png "SPDX 3.0.1 Build Profile diagram"
+[fig_core]: ../images/model-Core.png "SPDX 3.0.1 Core Profile diagram"
+[fig_dataset]: ../images/model-Dataset.png "SPDX 3.0.1 Dataset Profile diagram"
+[fig_extension]: ../images/model-Extension.png "SPDX 3.0.1 Extension Profile diagram"
+[fig_licensing]: ../images/model-Licensing.png "SPDX 3.0.1 Licensing Profile diagram"
+[fig_security]: ../images/model-Security.png "SPDX 3.0.1 Security Profile diagram"
+[fig_software]: ../images/model-Software.png "SPDX 3.0.1 Software Profile diagram"
diff --git a/docs/images/model-AI.png b/docs/images/model-AI.png
new file mode 100644
index 0000000000..d0cc0f2514
Binary files /dev/null and b/docs/images/model-AI.png differ
diff --git a/docs/images/model-Build.png b/docs/images/model-Build.png
new file mode 100644
index 0000000000..378465b184
Binary files /dev/null and b/docs/images/model-Build.png differ
diff --git a/docs/images/model-Core.png b/docs/images/model-Core.png
new file mode 100644
index 0000000000..49892cc23a
Binary files /dev/null and b/docs/images/model-Core.png differ
diff --git a/docs/images/model-Dataset.png b/docs/images/model-Dataset.png
new file mode 100644
index 0000000000..4e0af94429
Binary files /dev/null and b/docs/images/model-Dataset.png differ
diff --git a/docs/images/model-Extension.png b/docs/images/model-Extension.png
new file mode 100644
index 0000000000..f8f131e7fb
Binary files /dev/null and b/docs/images/model-Extension.png differ
diff --git a/docs/images/model-Licensing.png b/docs/images/model-Licensing.png
new file mode 100644
index 0000000000..23909d9d65
Binary files /dev/null and b/docs/images/model-Licensing.png differ
diff --git a/docs/images/model-Security.png b/docs/images/model-Security.png
new file mode 100644
index 0000000000..e1bb3ac56e
Binary files /dev/null and b/docs/images/model-Security.png differ
diff --git a/docs/images/model-Software.png b/docs/images/model-Software.png
new file mode 100644
index 0000000000..e117b72932
Binary files /dev/null and b/docs/images/model-Software.png differ
diff --git a/docs/images/model-ai.png b/docs/images/model-ai.png
deleted file mode 100644
index b71fe60e71..0000000000
Binary files a/docs/images/model-ai.png and /dev/null differ
diff --git a/docs/images/model-build.png b/docs/images/model-build.png
deleted file mode 100644
index c23b394492..0000000000
Binary files a/docs/images/model-build.png and /dev/null differ
diff --git a/docs/images/model-core-software.png b/docs/images/model-core-software.png
deleted file mode 100644
index 5f6c2f038e..0000000000
Binary files a/docs/images/model-core-software.png and /dev/null differ
diff --git a/docs/images/model-dataset.png b/docs/images/model-dataset.png
deleted file mode 100644
index 3ad3d4e4e9..0000000000
Binary files a/docs/images/model-dataset.png and /dev/null differ
diff --git a/docs/images/model-extension.png b/docs/images/model-extension.png
deleted file mode 100644
index 71f5853cfd..0000000000
Binary files a/docs/images/model-extension.png and /dev/null differ
diff --git a/docs/images/model-licensing.png b/docs/images/model-licensing.png
deleted file mode 100644
index eb23d211ae..0000000000
Binary files a/docs/images/model-licensing.png and /dev/null differ
diff --git a/docs/images/model-security.png b/docs/images/model-security.png
deleted file mode 100644
index 1267c80825..0000000000
Binary files a/docs/images/model-security.png and /dev/null differ