diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
index e5d6ed0..302a0e3 100644
--- a/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
+++ b/docs/add-on-component-development-guide/src/main/jbake/content/adding-container-capabilities.adoc
@@ -14,7 +14,7 @@
 7 Adding Container Capabilities
 -------------------------------
 
-Applications run on GlassFish Server in containers. GlassFish Server
+Applications run on Eclipse GlassFish Server in containers. GlassFish Server
 enables you to create containers that extend or replace the existing
 containers of GlassFish Server. Adding container capabilities enables
 you to run new types of applications and to deploy new archive types in
@@ -72,7 +72,7 @@
 package com.example.containers;
 ...
 
-@Service @javax.inject.Named("com.example.containers.MyContainer")
+@Service @jakarta.inject.Named("com.example.containers.MyContainer")
 public class MyContainer implements Container {
 ...
 }
@@ -257,7 +257,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 An archive handler is responsible for handling the particular layout of
-an archive. Java EE defines a set of archives (WAR, JAR, and RAR, for
+an archive. Jakarta EE defines a set of archives (WAR, JAR, and RAR, for
 example), and each of these archives has an `ArchiveHandler` instance
 associated with the archive type.
 
@@ -795,9 +795,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 import jakarta.annotation.Resource;