diff --git a/main/coreplugins/io.sarl.lang.core/src/io/sarl/bootstrap/SREBootstrap.java b/main/coreplugins/io.sarl.lang.core/src/io/sarl/bootstrap/SREBootstrap.java
index a27fb95bb4..bb08a3457d 100644
--- a/main/coreplugins/io.sarl.lang.core/src/io/sarl/bootstrap/SREBootstrap.java
+++ b/main/coreplugins/io.sarl.lang.core/src/io/sarl/bootstrap/SREBootstrap.java
@@ -136,8 +136,17 @@ default void setBootAgentTypeContextUUID() {
 	 * <p>This function has no effect if the agent framework is already launched.
 	 *
 	 * @since 0.7
+	 * @see #setUniverseContextUUID(UUID)
+	 * @see #getUniverseContextUUID()
+	 * @see #setUniverseSpaceUUID(UUID)
+	 * @see #getUniverseSpaceUUID()
+	 * @deprecated see {@link #setSpecificContextUUID()}
 	 */
+	@Deprecated
 	default void setDefaultContextUUID() {
+		setSpecificContextUUID();
+	}
+
 	/**
 	 * Force the SRE platform to use the identifier hard-coded in the source code for its default context.
 	 *
diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Bootstrap.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Bootstrap.java
index b4f8bf4d53..c4e2d32067 100644
--- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Bootstrap.java
+++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/Bootstrap.java
@@ -121,7 +121,7 @@ public void setBootAgentTypeContextUUID() {
 	}
 
 	@Override
-	public void setDefaultContextUUID() {
+	public void setSpecificContextUUID() {
 		Boot.setDefaultContextUUID();
 	}