(causeway) branch 3975-telemetry updated: CAUSEWAY-3975: relocates ia service and context (applib.services.iactn)

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 3975-telemetry
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/3975-telemetry by this push:
     new 52a74de9fc3 CAUSEWAY-3975: relocates ia service and context (applib.services.iactn)
52a74de9fc3 is described below

commit 52a74de9fc364a55cb07123f3c88f3d86bce01e2
Author: andi-huber <ah...@apache.org>
AuthorDate: Wed Apr 1 14:18:04 2026 +0200

    CAUSEWAY-3975: relocates ia service and context (applib.services.iactn)
---
 api/applib/src/main/java/module-info.java                           | 1 -
 .../main/java/org/apache/causeway/applib/clock/VirtualClock.java    | 4 ++--
 .../apache/causeway/applib/events/metamodel/MetamodelListener.java  | 4 ++--
 .../org/apache/causeway/applib/services/clock/ClockService.java     | 2 +-
 .../causeway/applib/services/command/CommandExecutorService.java    | 6 +++---
 .../applib/services/{iactnlayer => iactn}/InteractionContext.java   | 3 +--
 .../apache/causeway/applib/services/iactn/InteractionProvider.java  | 3 +--
 .../applib/services/{iactnlayer => iactn}/InteractionService.java   | 4 +---
 .../java/org/apache/causeway/applib/services/sudo/SudoService.java  | 4 ++--
 .../apache/causeway/applib/services/sudo/SudoServiceListener.java   | 4 ++--
 .../java/org/apache/causeway/applib/services/user/UserMemento.java  | 2 +-
 .../java/org/apache/causeway/applib/services/user/UserService.java  | 4 ++--
 .../org/apache/causeway/applib/services/wrapper/WrapperFactory.java | 2 +-
 .../causeway/applib/services/wrapper/control/AsyncControl.java      | 2 +-
 .../causeway/applib/services/wrapper/control/SyncControl.java       | 2 +-
 .../causeway/applib/value/semantics/ValueSemanticsAbstract.java     | 2 +-
 .../causeway/applib/value/semantics/ValueSemanticsProvider.java     | 2 +-
 .../applib/services/iactnlayer/InteractionContext_combine_Test.java | 2 ++
 .../causeway/core/config/beans/CausewayDomainObjectScope.java       | 2 +-
 .../apache/causeway/core/interaction/scope/InteractionScope.java    | 2 +-
 .../apache/causeway/core/metamodel/context/HasMetaModelContext.java | 2 +-
 .../apache/causeway/core/metamodel/context/MetaModelContext.java    | 2 +-
 .../causeway/core/metamodel/context/MetaModelContextShortcuts.java  | 2 +-
 .../core/metamodel/context/MetaModelContext_usingSpring.java        | 2 +-
 .../apache/causeway/core/metamodel/execution/InteractionLayer.java  | 4 ++--
 .../causeway/core/metamodel/execution/InteractionLayerStack.java    | 2 +-
 .../causeway/core/metamodel/execution/InteractionLayerTracker.java  | 4 ++--
 .../causeway/core/metamodel/interactions/InteractionContext.java    | 4 ++--
 .../causeway/core/metamodel/facets/FacetFactoryTestAbstract.java    | 2 +-
 .../facets/value/JavaUtilDateValueSemanticsProviderTest.java        | 2 +-
 .../facets/value/ValueSemanticsProviderAbstractTestCase.java        | 2 +-
 .../security/StandardAuthenticationManager_AuthenticationTest.java  | 2 +-
 .../causeway/core/mmtestsupport/InteractionService_forTesting.java  | 4 ++--
 .../causeway/core/mmtestsupport/MetaModelContext_forTesting.java    | 4 ++--
 .../core/runtimeservices/factory/FactoryServiceDefault.java         | 2 +-
 .../causeway/core/runtimeservices/ia/InteractionServiceDefault.java | 4 ++--
 .../org/apache/causeway/core/runtimeservices/ia/_Observation.java   | 2 +-
 .../core/runtimeservices/locale/LanguageProviderDefault.java        | 2 +-
 .../runtimeservices/publish/ObjectLifecyclePublisherDefault.java    | 2 +-
 .../core/runtimeservices/transaction/TransactionServiceSpring.java  | 6 +++---
 .../apache/causeway/core/runtimeservices/wrapper/AsyncExecutor.java | 4 ++--
 .../core/runtimeservices/wrapper/WrapperFactoryDefault.java         | 4 ++--
 .../core/runtimeservices/wrapper/internal/CommandRecord.java        | 2 +-
 .../core/security/authentication/AuthenticationRequest.java         | 2 +-
 .../apache/causeway/core/security/authentication/Authenticator.java | 2 +-
 .../core/security/authentication/InteractionContextFactory.java     | 2 +-
 .../causeway/core/security/authentication/logout/LogoutMenu.java    | 2 +-
 .../core/security/authentication/manager/AuthenticationManager.java | 4 ++--
 .../core/security/authentication/manager/UserMementoRefiner.java    | 2 +-
 .../security/authentication/standard/AuthenticatorAbstract.java     | 2 +-
 .../org/apache/causeway/core/security/authorization/Authorizor.java | 2 +-
 .../core/security/authorization/manager/AuthorizationManager.java   | 2 +-
 .../java/org/apache/causeway/security/EncodabilityContractTest.java | 2 +-
 .../standard/SimpleSessionEncodabilityNoRolesTest.java              | 2 +-
 .../standard/SimpleSessionEncodabilityTestAbstract.java             | 2 +-
 .../standard/SimpleSessionEncodabilityWithRolesTest.java            | 2 +-
 .../core/webapp/health/HealthIndicatorUsingHealthCheckService.java  | 2 +-
 .../webapp/health/HealthIndicatorUsingHealthCheckServiceTest.java   | 2 +-
 .../extensions/commandlog/applib/dom/BackgroundService.java         | 2 +-
 .../extensions/commandlog/applib/fakescheduler/FakeScheduler.java   | 2 +-
 .../extensions/commandlog/applib/job/RunBackgroundCommandsJob.java  | 4 ++--
 .../applib/integtest/BackgroundService_IntegTestAbstract.java       | 2 +-
 .../commandlog/applib/integtest/CommandLog_IntegTestAbstract.java   | 4 ++--
 .../applib/integtest/ExecutionLog_IntegTestAbstract.java            | 4 ++--
 .../applib/integtest/ExecutionOutbox_IntegTestAbstract.java         | 4 ++--
 .../restclient/integtests/OutboxRestClient_IntegTest.java           | 2 +-
 .../audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java  | 2 +-
 .../extensions/secman/applib/seed/SeedSecurityModuleService.java    | 2 +-
 .../springoauth2/dom/ApplicationUserAutoCreationService.java        | 2 +-
 .../secman/integration/authenticator/AuthenticatorSecman.java       | 2 +-
 .../extensions/secman/integration/authorizor/AuthorizorSecman.java  | 2 +-
 .../sessionlog/applib/spiimpl/SessionLogServiceInitializer.java     | 2 +-
 .../sessionlog/applib/spiimpl/SessionSubscriberForSessionLog.java   | 2 +-
 .../spring/security/oauth2/restful/AuthenticationStrategyJwt.java   | 2 +-
 .../fullcalendar/wkt/ui/viewer/EventProviderAbstract.java           | 2 +-
 .../causeway/extensions/sse/wicket/services/SseServiceDefault.java  | 2 +-
 .../commandreplay/secondary/job/ReplicateAndReplayJob.java          | 4 ++--
 .../testdomain/jpa/publishing/PublishingTestFactoryJpa.java         | 2 +-
 .../apache/causeway/testdomain/jpa/rest/JpaRestEndpointService.java | 2 +-
 .../java/org/apache/causeway/testdomain/RegressionTestAbstract.java | 2 +-
 .../org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java | 2 +-
 .../testdomain/publishing/PublishingTestFactoryAbstract.java        | 2 +-
 .../testdomain/util/interaction/DomainObjectTesterFactory.java      | 2 +-
 .../testdomain/util/interaction/InteractionTestAbstract.java        | 2 +-
 .../generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java    | 2 +-
 .../testdomain/domainmodel/DomainModelTest_usingBadDomain.java      | 2 +-
 .../interact/ActionInteractionTest_notUsingAllowSafeSemantics.java  | 2 +-
 .../interact/ActionInteractionTest_usingAllowSafeSemantics.java     | 2 +-
 .../org/apache/causeway/testdomain/interact/CustomContextTest.java  | 2 +-
 .../interact/CustomContextWithNoPermissionChecksTest.java           | 2 +-
 .../regressiontests/layouts/integtest/Layout_Counter_IntegTest.java | 2 +-
 .../layouts/integtest/Layout_SimpleObject_IntegTest.java            | 2 +-
 .../apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java    | 2 +-
 .../jpa/JpaTransactionRollbackTest_usingInteractionService.java     | 2 +-
 .../transactions/jpa/JpaTransactionScopeListenerTest.java           | 2 +-
 .../org/apache/causeway/testdomain/value/ValueSemanticsTest.java    | 2 +-
 .../org/apache/causeway/testdomain/value/ValueSemanticsTester.java  | 4 ++--
 .../src/test/java/org/apache/causeway/testdomain/value/_Utils.java  | 2 +-
 .../causeway/security/bypass/authorization/AuthorizorBypass.java    | 2 +-
 .../security/simple/authentication/SimpleAuthenticator.java         | 2 +-
 .../causeway/security/simple/authorization/SimpleAuthorizor.java    | 2 +-
 .../org/apache/causeway/security/simple/SecuritySimpleAuthTest.java | 2 +-
 .../security/spring/authentication/AuthenticatorSpring.java         | 2 +-
 .../causeway/security/spring/webmodule/SpringSecurityFilter.java    | 4 ++--
 .../testing/fixtures/applib/fixturescripts/FixtureScripts.java      | 2 +-
 .../integtestsupport/applib/CausewayIntegrationGwtAbstract.java     | 2 +-
 .../integtestsupport/applib/CausewayIntegrationTestBase.java        | 2 +-
 .../testing/integtestsupport/applib/CausewayInteractionHandler.java | 2 +-
 .../apache/causeway/testing/integtestsupport/applib/_Helper.java    | 4 ++--
 .../testing/integtestsupport/applib/annotation/InteractAs.java      | 4 ++--
 .../testing/integtestsupport/applib/annotation/InteractAsUtils.java | 2 +-
 .../AsyncExecutionStrategyResolvingWithinInteraction.java           | 4 ++--
 .../rendering/context/ResourceContext_getArg_Test.java              | 2 +-
 .../restfulobjects/viewer/resources/HomePageReprRenderer.java       | 2 +-
 .../viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java | 2 +-
 .../viewer/restfulobjects/viewer/resources/UserReprRenderer.java    | 2 +-
 .../viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java   | 2 +-
 .../viewer/webmodule/CausewayRestfulObjectsInteractionFilter2.java  | 2 +-
 .../viewer/webmodule/auth/AuthenticationStrategy.java               | 2 +-
 .../viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java      | 2 +-
 .../viewer/webmodule/auth/AuthenticationStrategyUsingSession.java   | 2 +-
 .../context/ResourceContext_ensureCompatibleAcceptHeader_Test.java  | 4 ++--
 .../wicket/model/causeway/HasAmendableInteractionContext.java       | 4 ++--
 .../viewer/wicket/ui/test/components/scalars/ConverterTester.java   | 4 ++--
 .../components/attributes/temporal/TemporalDecompositionModel.java  | 2 +-
 .../viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java     | 2 +-
 .../viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java  | 2 +-
 .../viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java      | 2 +-
 .../causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java  | 2 +-
 .../viewer/integration/AuthenticatedWebSessionForCauseway.java      | 2 +-
 .../viewer/wicket/viewer/integration/LocalizerForCauseway.java      | 2 +-
 .../viewer/wicket/viewer/integration/SessionAuthenticator.java      | 4 ++--
 .../wicket/viewer/integration/WebRequestCycleForCauseway.java       | 2 +-
 .../AuthenticatedWebSessionForCauseway_Authenticate.java            | 2 +-
 .../integration/AuthenticatedWebSessionForCauseway_SignIn.java      | 2 +-
 .../AuthenticatedWebSessionForCauseway_TestAbstract.java            | 2 +-
 136 files changed, 168 insertions(+), 171 deletions(-)

diff --git a/api/applib/src/main/java/module-info.java b/api/applib/src/main/java/module-info.java
index 99aa89988b8..bc34e9bf119 100644
--- a/api/applib/src/main/java/module-info.java
+++ b/api/applib/src/main/java/module-info.java
@@ -77,7 +77,6 @@
     exports org.apache.causeway.applib.services.homepage;
     exports org.apache.causeway.applib.services.i18n;
     exports org.apache.causeway.applib.services.iactn;
-    exports org.apache.causeway.applib.services.iactnlayer;
     exports org.apache.causeway.applib.services.inject;
     exports org.apache.causeway.applib.services.jaxb;
     exports org.apache.causeway.applib.services.keyvaluestore;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/clock/VirtualClock.java b/api/applib/src/main/java/org/apache/causeway/applib/clock/VirtualClock.java
index 3bd0fa7377c..79363e086e6 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/clock/VirtualClock.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/clock/VirtualClock.java
@@ -34,8 +34,8 @@
 
 import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 
 /**
  * Works in connection with {@link InteractionService},
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java b/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
index a50965d9723..0b8e6b817ae 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/events/metamodel/MetamodelListener.java
@@ -52,7 +52,7 @@ public interface MetamodelListener {
      * <p>
      *     NOTE that this callback is called without any
      *     {@link org.apache.causeway.applib.services.iactnlayer.InteractionLayer interaction} (aka persistence session)
-     *     set up; use {@link org.apache.causeway.applib.services.iactnlayer.InteractionService} to create one if required.
+     *     set up; use {@link org.apache.causeway.applib.services.iactn.InteractionService} to create one if required.
      * </p>
      */
     void onMetamodelLoaded();
@@ -61,7 +61,7 @@ public interface MetamodelListener {
      * <p>
      *     NOTE that this callback is called without any
      *     {@link org.apache.causeway.applib.services.iactnlayer.InteractionLayer interaction} (aka persistence session)
-     *     set up; use {@link org.apache.causeway.applib.services.iactnlayer.InteractionService} to create one if required.
+     *     set up; use {@link org.apache.causeway.applib.services.iactn.InteractionService} to create one if required.
      * </p>
      */
     default void onMetamodelAboutToBeLoaded() {}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
index a548a011bff..664d62caf08 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/clock/ClockService.java
@@ -28,8 +28,8 @@
 import org.apache.causeway.applib.CausewayModuleApplib;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.clock.VirtualClock;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 
 import lombok.RequiredArgsConstructor;
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
index d3844fa14fc..3e496b1b87f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/command/CommandExecutorService.java
@@ -25,7 +25,7 @@
 import org.apache.causeway.applib.jaxb.JavaSqlXMLGregorianCalendarMarshalling;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.commons.functional.Try;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
@@ -33,7 +33,7 @@
 /**
  * Provides a mechanism to execute a {@link Command}.
  *
- * @see org.apache.causeway.applib.services.iactnlayer.InteractionService
+ * @see org.apache.causeway.applib.services.iactn.InteractionService
  * @see org.apache.causeway.applib.services.iactnlayer.InteractionProvider
  *
  * @since 1.x {@index}
@@ -41,7 +41,7 @@
 public interface CommandExecutorService {
 
     /**
-     * Determines the {@link org.apache.causeway.applib.services.iactnlayer.InteractionContext} (the &quot;who&quot;
+     * Determines the {@link org.apache.causeway.applib.services.iactn.InteractionContext} (the &quot;who&quot;
      * &quot;when&quot; and &quot;where&quot;) within which the {@link Command} should be executed.
      *
      * @since 1.x {@index}
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionContext.java
similarity index 98%
rename from api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext.java
rename to api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionContext.java
index 5e1aa62c271..5bc116b69ac 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionContext.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.applib.services.iactnlayer;
+package org.apache.causeway.applib.services.iactn;
 
 import java.io.Serializable;
 import java.time.Instant;
@@ -29,7 +29,6 @@
 
 import org.apache.causeway.applib.clock.VirtualClock;
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactn.Interaction;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 import lombok.AccessLevel;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
index 5a1c8e52984..bb4e0b9a5eb 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionProvider.java
@@ -21,7 +21,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.commons.internal.debug._Probe;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 
@@ -53,7 +52,7 @@ public interface InteractionProvider {
     Optional<Interaction> currentInteraction();
 
     /**
-     * Optionally, the currently active {@link org.apache.causeway.applib.services.iactnlayer.InteractionContext} for the calling thread.
+     * Optionally, the currently active {@link org.apache.causeway.applib.services.iactn.InteractionContext} for the calling thread.
      */
     Optional<InteractionContext> currentInteractionContext();
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionService.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionService.java
rename to api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionService.java
index 171cad7d28a..716a732f276 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/iactnlayer/InteractionService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/iactn/InteractionService.java
@@ -16,14 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.applib.services.iactnlayer;
+package org.apache.causeway.applib.services.iactn;
 
 import java.util.concurrent.Callable;
 
 import org.jspecify.annotations.NonNull;
 
-import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactn.InteractionProvider;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
 import org.apache.causeway.commons.functional.Try;
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
index 070e38d58d7..fe682185df4 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoService.java
@@ -33,9 +33,9 @@
 
 import org.apache.causeway.applib.CausewayModuleApplib;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.RoleMemento;
 import org.apache.causeway.applib.services.user.UserService;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoServiceListener.java b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoServiceListener.java
index 749e7d2d180..067c2b5044e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoServiceListener.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/sudo/SudoServiceListener.java
@@ -18,10 +18,10 @@
  */
 package org.apache.causeway.applib.services.sudo;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-
 import org.jspecify.annotations.NonNull;
 
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+
 /**
  * Allows the {@link SudoService} to notify other {@link org.springframework.stereotype.Service}s or
  * {@link org.springframework.stereotype.Component}s that the effective user has been changed.
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
index cfee71008d7..a97ab6ab17f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
@@ -48,7 +48,7 @@
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.base._Strings;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
index a047f1b88fd..ce207047648 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserService.java
@@ -33,8 +33,8 @@
 
 import org.apache.causeway.applib.CausewayModuleApplib;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.applib.services.keyvaluestore.KeyValueSessionStore;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.commons.internal.assertions._Assert;
@@ -65,7 +65,7 @@
  * </p>
  *
  * @see org.apache.causeway.applib.services.iactnlayer.InteractionProvider
- * @see org.apache.causeway.applib.services.iactnlayer.InteractionContext
+ * @see org.apache.causeway.applib.services.iactn.InteractionContext
  * @see SudoService
  * @see ImpersonateMenu
  *
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
index 8627d69af50..fb09bd84a63 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/WrapperFactory.java
@@ -26,7 +26,7 @@
 
 import org.apache.causeway.applib.exceptions.recoverable.InteractionException;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
 import org.apache.causeway.applib.services.wrapper.control.SyncControl;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
index c0e29ba6df8..0b2d085c6a7 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/AsyncControl.java
@@ -28,7 +28,7 @@
 
 import org.apache.causeway.applib.clock.VirtualClock;
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/SyncControl.java b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/SyncControl.java
index cb2896057fa..36d638d087c 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/SyncControl.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/wrapper/control/SyncControl.java
@@ -22,7 +22,7 @@
 
 import org.jspecify.annotations.Nullable;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
 
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
index 40e599550b0..de39393fc21 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsAbstract.java
@@ -45,7 +45,7 @@
 import org.apache.causeway.applib.services.bookmark.IdStringifier;
 import org.apache.causeway.applib.services.i18n.TranslationContext;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.render.PlaceholderRenderService;
 import org.apache.causeway.applib.services.render.PlaceholderRenderService.PlaceholderLiteral;
 import org.apache.causeway.applib.util.schema.CommonDtoUtils;
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
index c28cc0c4897..909cd317940 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/value/semantics/ValueSemanticsProvider.java
@@ -24,7 +24,7 @@
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.Value;
 import org.apache.causeway.applib.services.bookmark.IdStringifier;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.schema.chg.v2.ChangesDto;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
diff --git a/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext_combine_Test.java b/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext_combine_Test.java
index cae0bd7f1d8..2f7b0630adb 100644
--- a/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext_combine_Test.java
+++ b/api/applib/src/test/java/org/apache/causeway/applib/services/iactnlayer/InteractionContext_combine_Test.java
@@ -24,6 +24,8 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+
 class InteractionContext_combine_Test {
 
     @Test
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
index 0ef1e886caf..0591c338e5f 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
@@ -27,7 +27,7 @@
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
index 4f163054420..a2042ef5668 100644
--- a/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
+++ b/core/interaction/src/main/java/org/apache/causeway/core/interaction/scope/InteractionScope.java
@@ -28,7 +28,7 @@
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.collections._Maps;
 import org.apache.causeway.commons.internal.debug._Probe;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
index 94f3b0a3332..6d4272022a6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
@@ -22,7 +22,7 @@
 
 import org.apache.causeway.applib.services.factory.FactoryService;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.menu.MenuBarsService;
 import org.apache.causeway.applib.services.message.MessageService;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
index 94321098b32..173536120b5 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext.java
@@ -26,7 +26,7 @@
 import org.apache.causeway.applib.annotation.Programmatic;
 import org.apache.causeway.applib.services.factory.FactoryService;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.menu.MenuBarsService;
 import org.apache.causeway.applib.services.message.MessageService;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContextShortcuts.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContextShortcuts.java
index e325b1b2c92..082bdf232a8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContextShortcuts.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContextShortcuts.java
@@ -26,7 +26,7 @@
 import org.apache.causeway.applib.locale.UserLocale;
 import org.apache.causeway.applib.services.ascii.AsciiIdentifierService;
 import org.apache.causeway.applib.services.i18n.TranslationContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common;
 import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
 import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common.Application;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
index 7f34cdf498c..587af152d6e 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/MetaModelContext_usingSpring.java
@@ -27,7 +27,7 @@
 import org.apache.causeway.applib.services.factory.FactoryService;
 import org.apache.causeway.applib.services.homepage.HomePageResolverService;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.menu.MenuBarsService;
 import org.apache.causeway.applib.services.message.MessageService;
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayer.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayer.java
index 95203226718..9f6b8089d54 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayer.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayer.java
@@ -26,8 +26,8 @@
 import org.springframework.util.Assert;
 
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.exceptions._Exceptions.FirstExceptionCollector;
 import org.apache.causeway.core.metamodel.execution.InteractionCarrier.InteractionCarrierForTesting;
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerStack.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerStack.java
index 2e4925d0755..3987a189686 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerStack.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerStack.java
@@ -25,7 +25,7 @@
 
 import org.springframework.util.Assert;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.internal.exceptions._Exceptions.FirstExceptionCollector;
 import org.apache.causeway.commons.internal.observation.ObservationClosure;
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerTracker.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerTracker.java
index 0c498c50ddb..c9463b975f2 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerTracker.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/execution/InteractionLayerTracker.java
@@ -21,9 +21,9 @@
 import java.util.Optional;
 
 import org.apache.causeway.applib.services.iactn.Interaction;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 
 /**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionContext.java
index c7c15861a05..f22072df906 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/InteractionContext.java
@@ -34,7 +34,7 @@
  * There are two main responsibilities:
  * <ul>
  * <li>Wraps up a target object, parameters and a
- * {@link org.apache.causeway.applib.services.iactnlayer.InteractionContext}.
+ * {@link org.apache.causeway.applib.services.iactn.InteractionContext}.
  * Defining this as a separate interface makes for a more stable API</li>
  * <li>Acts as a factory for the corresponding {@link InteractionEvent} (more on
  * this below).</li>
@@ -46,7 +46,7 @@
  * code-smell. However, it is required because the {@link InteractionContext
  * context} hierarchy is internal to the framework (with references to
  * {@link ManagedObject}s,
- * {@link org.apache.causeway.applib.services.iactnlayer.InteractionContext}s and so forth), whereas
+ * {@link org.apache.causeway.applib.services.iactn.InteractionContext}s and so forth), whereas
  * the {@link InteractionEvent event} hierarchy is part of AppLib, that is
  * public API.
  *
diff --git a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
index a286ff984aa..12ddae473ef 100644
--- a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
+++ b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/FacetFactoryTestAbstract.java
@@ -34,7 +34,7 @@
 import org.apache.causeway.applib.annotation.Introspection.IntrospectionPolicy;
 import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.assertions._Assert;
 import org.apache.causeway.commons.internal.reflection._GenericResolver.ResolvedMethod;
 import org.apache.causeway.commons.internal.reflection._MethodFacades;
diff --git a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 7103d5c0d0c..2dee7a34e6c 100644
--- a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@
 import org.apache.causeway.applib.annotation.TimePrecision;
 import org.apache.causeway.applib.exceptions.recoverable.TextEntryParseException;
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.value.semantics.TemporalValueSemantics;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsProvider.Context;
diff --git a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 864dcd8cbe2..178bd7a4f41 100644
--- a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -34,7 +34,7 @@
 
 import org.springframework.boot.test.util.TestPropertyValues;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.render.PlaceholderRenderService.PlaceholderLiteral;
 import org.apache.causeway.applib.value.Blob;
 import org.apache.causeway.applib.value.Clob;
diff --git a/core/mmtest/src/test/java/org/apache/causeway/mmtest/security/StandardAuthenticationManager_AuthenticationTest.java b/core/mmtest/src/test/java/org/apache/causeway/mmtest/security/StandardAuthenticationManager_AuthenticationTest.java
index eb7d24844c0..9c79503c52a 100644
--- a/core/mmtest/src/test/java/org/apache/causeway/mmtest/security/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/mmtest/src/test/java/org/apache/causeway/mmtest/security/StandardAuthenticationManager_AuthenticationTest.java
@@ -27,7 +27,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.mmtestsupport.InteractionService_forTesting;
 import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
 import org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
diff --git a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/InteractionService_forTesting.java b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/InteractionService_forTesting.java
index b6e940d628b..140f55f1b94 100644
--- a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/InteractionService_forTesting.java
+++ b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/InteractionService_forTesting.java
@@ -28,8 +28,8 @@
 import org.apache.causeway.applib.services.command.Command;
 import org.apache.causeway.applib.services.iactn.Execution;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
 import org.apache.causeway.core.metamodel.execution.InteractionCarrier.InteractionCarrierForTesting;
diff --git a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
index 4e0f8eef81d..8d6fa1b0b47 100644
--- a/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
+++ b/core/mmtestsupport/src/main/java/org/apache/causeway/core/mmtestsupport/MetaModelContext_forTesting.java
@@ -38,8 +38,8 @@
 import org.apache.causeway.applib.services.grid.GridMarshaller;
 import org.apache.causeway.applib.services.grid.GridService;
 import org.apache.causeway.applib.services.i18n.TranslationService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.jaxb.JaxbService;
 import org.apache.causeway.applib.services.layout.LayoutService;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
index 56373acbc38..eb6cf27282a 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -32,7 +32,7 @@
 import org.apache.causeway.applib.graph.tree.TreeNode;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/InteractionServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/InteractionServiceDefault.java
index 62f0801b9da..fda5e3dd391 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/InteractionServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/InteractionServiceDefault.java
@@ -39,8 +39,8 @@
 import org.apache.causeway.applib.services.clock.ClockService;
 import org.apache.causeway.applib.services.command.Command;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
 import org.apache.causeway.commons.internal.debug._Probe;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/_Observation.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/_Observation.java
index ec08fccfdcf..2d464c58992 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/_Observation.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/ia/_Observation.java
@@ -18,7 +18,7 @@
  */
 package org.apache.causeway.core.runtimeservices.ia;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.internal.base._Strings;
 
 import static org.apache.causeway.core.config.observation.CausewayObservationIntegration.interactionClock;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java
index 85e8ea561c1..fa1a443d7e4 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/locale/LanguageProviderDefault.java
@@ -31,8 +31,8 @@
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.locale.UserLocale;
 import org.apache.causeway.applib.services.i18n.LanguageProvider;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 
 import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
index b4bce52df7a..4e899e09a45 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/publish/ObjectLifecyclePublisherDefault.java
@@ -32,7 +32,7 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.TransactionScope;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.functional.Either;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
index cc52060ddeb..ee4675f8db1 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/transaction/TransactionServiceSpring.java
@@ -46,7 +46,7 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.xactn.TransactionId;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.applib.services.xactn.TransactionState;
@@ -376,8 +376,8 @@ public void onOpen(final @NonNull Interaction interaction) {
 
     /**
      * For use only by {@link org.apache.causeway.core.runtimeservices.ia.InteractionServiceDefault}, if
-     * {@link org.apache.causeway.applib.services.iactnlayer.InteractionService#run(InteractionContext, ThrowingRunnable)}
-     * or {@link org.apache.causeway.applib.services.iactnlayer.InteractionService#call(InteractionContext, Callable)}
+     * {@link org.apache.causeway.applib.services.iactn.InteractionService#run(InteractionContext, ThrowingRunnable)}
+     * or {@link org.apache.causeway.applib.services.iactn.InteractionService#call(InteractionContext, Callable)}
      * (or their various overloads) result in an exception.
      *
      * @param interaction The {@link Interaction} object representing the current interaction.
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/AsyncExecutor.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/AsyncExecutor.java
index 734a697c4da..16060e10184 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/AsyncExecutor.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/AsyncExecutor.java
@@ -30,8 +30,8 @@
 
 import org.springframework.transaction.annotation.Propagation;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 9d78baef0e4..a62f77cd977 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -45,8 +45,8 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
 import org.apache.causeway.applib.services.wrapper.control.SyncControl;
diff --git a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/internal/CommandRecord.java b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/internal/CommandRecord.java
index 176c1313c4f..beb06ba1ef9 100644
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/internal/CommandRecord.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/internal/CommandRecord.java
@@ -20,7 +20,7 @@
 
 import java.util.UUID;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
 import org.apache.causeway.core.metamodel.execution.InteractionIdGenerator;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/AuthenticationRequest.java
index 18433f6300e..d92955b6441 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/AuthenticationRequest.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/AuthenticationRequest.java
@@ -22,7 +22,7 @@
 
 import org.jspecify.annotations.Nullable;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 /**
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/Authenticator.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/Authenticator.java
index 754e4da147c..4df85796dfa 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/Authenticator.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/Authenticator.java
@@ -18,7 +18,7 @@
  */
 package org.apache.causeway.core.security.authentication;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 
 /**
  * Represents an authentication mechanism capable of authenticating certain
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/InteractionContextFactory.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/InteractionContextFactory.java
index 7782554cd3b..c7bef27fc12 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/InteractionContextFactory.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/InteractionContextFactory.java
@@ -18,7 +18,7 @@
  */
 package org.apache.causeway.core.security.authentication;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
index c690d527f96..67b7106fde5 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java
@@ -33,8 +33,8 @@
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.Publishing;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.applib.value.LocalResourcePath;
 import org.apache.causeway.applib.value.OpenUrlStrategy;
 import org.apache.causeway.commons.internal.base._NullSafe;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
index 49bc7bda2f4..6baf989289a 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java
@@ -33,8 +33,8 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.exceptions.unrecoverable.NoAuthenticatorException;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.util.ToString;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/UserMementoRefiner.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/UserMementoRefiner.java
index 47979598f5a..366663c45b5 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/UserMementoRefiner.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/UserMementoRefiner.java
@@ -20,7 +20,7 @@
 
 import org.jspecify.annotations.Nullable;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/AuthenticatorAbstract.java
index 44645466600..df05df11675 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/AuthenticatorAbstract.java
@@ -18,7 +18,7 @@
  */
 package org.apache.causeway.core.security.authentication.standard;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.core.security.authentication.AuthenticationRequest;
 import org.apache.causeway.core.security.authentication.Authenticator;
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/Authorizor.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/Authorizor.java
index 602775b7149..060e2916493 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/Authorizor.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/Authorizor.java
@@ -19,7 +19,7 @@
 package org.apache.causeway.core.security.authorization;
 
 import org.apache.causeway.applib.Identifier;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 
 /**
  * Represents a mechanism to evaluate whether the current user (as represented
diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
index 7fb74a33cb4..a82f1869e8b 100644
--- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java
@@ -32,7 +32,7 @@
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.commons.internal.assertions._Assert;
 import org.apache.causeway.commons.internal.base._NullSafe;
diff --git a/core/security/src/test/java/org/apache/causeway/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/causeway/security/EncodabilityContractTest.java
index f31c975d729..dc8d2b03852 100644
--- a/core/security/src/test/java/org/apache/causeway/security/EncodabilityContractTest.java
+++ b/core/security/src/test/java/org/apache/causeway/security/EncodabilityContractTest.java
@@ -30,7 +30,7 @@
 
 import org.springframework.util.SerializationUtils;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 public abstract class EncodabilityContractTest {
diff --git a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index d8ad2eac6dc..086b6479371 100644
--- a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -20,7 +20,7 @@
 
 import java.io.Serializable;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 class SimpleSessionEncodabilityNoRolesTest
diff --git a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index d51bd1bdb70..fc8124f5ba8 100644
--- a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -22,7 +22,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.security.EncodabilityContractTest;
 
 abstract class SimpleSessionEncodabilityTestAbstract
diff --git a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index f641186557b..bdb0da2c7c5 100644
--- a/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/security/src/test/java/org/apache/causeway/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -20,7 +20,7 @@
 
 import java.io.Serializable;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 
 class SimpleSessionEncodabilityWithRolesTest
diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
index 4ae8d363851..bac6490f9a1 100644
--- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -30,7 +30,7 @@
 import org.springframework.stereotype.Component;
 
 import org.apache.causeway.applib.services.health.HealthCheckService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.security.authentication.InteractionContextFactory;
 
 @Component
diff --git a/core/webapp/src/test/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckServiceTest.java b/core/webapp/src/test/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckServiceTest.java
index e0d0e85f525..385c31962c4 100644
--- a/core/webapp/src/test/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckServiceTest.java
+++ b/core/webapp/src/test/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckServiceTest.java
@@ -37,7 +37,7 @@
 import org.springframework.boot.health.contributor.Health;
 
 import org.apache.causeway.applib.services.health.HealthCheckService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 
 @ExtendWith(MockitoExtension.class)
 class HealthIndicatorUsingHealthCheckServiceTest {
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
index 103ec061361..1acc16f6a63 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/BackgroundService.java
@@ -29,7 +29,7 @@
 import org.apache.causeway.applib.jaxb.JavaSqlJaxbAdapters;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory.AsyncProxy;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java
index c4368e36243..96224b4c4f9 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/fakescheduler/FakeScheduler.java
@@ -31,7 +31,7 @@
 import org.springframework.transaction.annotation.Propagation;
 
 import org.apache.causeway.applib.services.command.CommandExecutorService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.concurrent._ConcurrentContext;
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java
index e7939680ae7..d9282bd084d 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/job/RunBackgroundCommandsJob.java
@@ -37,8 +37,8 @@
 
 import org.apache.causeway.applib.services.clock.ClockService;
 import org.apache.causeway.applib.services.command.CommandExecutorService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.applib.util.schema.CommandDtoUtils;
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java
index cb09a0b956a..a72d641c4e3 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/BackgroundService_IntegTestAbstract.java
@@ -37,7 +37,7 @@
 
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory.AsyncProxy;
 import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
index a552c75b891..8909aa77aac 100644
--- a/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
+++ b/extensions/core/commandlog/applib/src/test/java/org/apache/causeway/extensions/commandlog/applib/integtest/CommandLog_IntegTestAbstract.java
@@ -36,8 +36,8 @@
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
diff --git a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
index 4c18c8d14fe..8f2a76cc284 100644
--- a/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
+++ b/extensions/core/executionlog/applib/src/test/java/org/apache/causeway/extensions/executionlog/applib/integtest/ExecutionLog_IntegTestAbstract.java
@@ -36,8 +36,8 @@
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
diff --git a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
index c35fe6211d9..d15edcf1e6b 100644
--- a/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
+++ b/extensions/core/executionoutbox/applib/src/test/java/org/apache/causeway/extensions/executionoutbox/applib/integtest/ExecutionOutbox_IntegTestAbstract.java
@@ -34,8 +34,8 @@
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
diff --git a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
index e2fc971dd64..6788d827eeb 100644
--- a/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
+++ b/extensions/core/executionoutbox/restclient/src/test/java/org/apache/causeway/extensions/executionoutbox/restclient/integtests/OutboxRestClient_IntegTest.java
@@ -38,7 +38,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.annotation.Propagation;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
index d182ff274b2..e6f739a0af7 100644
--- a/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
+++ b/extensions/security/audittrail/applib/src/test/java/org/apache/causeway/extensions/audittrail/applib/integtests/AuditTrail_IntegTestAbstract.java
@@ -30,7 +30,7 @@
 
 import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntry;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
index 89fce872e38..5f89a947093 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/seed/SeedSecurityModuleService.java
@@ -28,7 +28,7 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.events.metamodel.MetamodelEvent;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
 import org.apache.causeway.extensions.secman.applib.seed.scripts.SeedUsersAndRolesFixtureScript;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
index 46c6472e032..7415de5bd32 100644
--- a/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
+++ b/extensions/security/secman/delegated-springoauth2/src/main/java/org/apache/causeway/extensions/secman/delegated/springoauth2/dom/ApplicationUserAutoCreationService.java
@@ -35,7 +35,7 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.config.CausewayConfiguration;
 import org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRoleRepository;
 import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authenticator/AuthenticatorSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authenticator/AuthenticatorSecman.java
index f302a0176d3..707039a7cc8 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authenticator/AuthenticatorSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authenticator/AuthenticatorSecman.java
@@ -25,7 +25,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.core.security.authentication.AuthenticationRequest;
 import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
index 294e38b29c5..4f9b8140373 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/causeway/extensions/secman/integration/authorizor/AuthorizorSecman.java
@@ -35,7 +35,7 @@
 import org.apache.causeway.applib.annotation.InteractionScope;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.appfeat.ApplicationFeatureId;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.commons.internal.base._Lazy;
 import org.apache.causeway.commons.internal.collections._Maps;
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
index 03c494a875d..65f8c70b588 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionLogServiceInitializer.java
@@ -26,7 +26,7 @@
 
 import org.apache.causeway.applib.events.metamodel.MetamodelListener;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.config.CausewayConfiguration;
 import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntryRepository;
 
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionSubscriberForSessionLog.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionSubscriberForSessionLog.java
index 9f664d209ce..d28b0ea0692 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionSubscriberForSessionLog.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/spiimpl/SessionSubscriberForSessionLog.java
@@ -34,7 +34,7 @@
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.session.SessionSubscriber;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.extensions.sessionlog.applib.CausewayModuleExtSessionLogApplib;
diff --git a/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/restful/AuthenticationStrategyJwt.java b/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/restful/AuthenticationStrategyJwt.java
index 31f0fea4e4d..db31e3d8672 100644
--- a/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/restful/AuthenticationStrategyJwt.java
+++ b/extensions/security/spring-oauth2/src/main/java/org/apache/causeway/extensions/spring/security/oauth2/restful/AuthenticationStrategyJwt.java
@@ -26,7 +26,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.jwt.Jwt;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
 import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationStrategyAbstract;
 
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
index bc82cc7e3df..1a7904b7818 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
@@ -27,7 +27,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.internal.collections._Maps;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
diff --git a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
index 44beb7c1257..d779849b82e 100644
--- a/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
+++ b/extensions/vw/sse/wicket/src/main/java/org/apache/causeway/extensions/sse/wicket/services/SseServiceDefault.java
@@ -39,7 +39,7 @@
 import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.internal.collections._Lists;
 import org.apache.causeway.extensions.sse.applib.annotations.SseSource;
diff --git a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
index 00b29a43498..24b59852b41 100644
--- a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
+++ b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
@@ -27,8 +27,8 @@
 
 import org.springframework.stereotype.Component;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
 import org.apache.causeway.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands;
diff --git a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/publishing/PublishingTestFactoryJpa.java b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/publishing/PublishingTestFactoryJpa.java
index 77805fae6c1..44f90bcaa32 100644
--- a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/publishing/PublishingTestFactoryJpa.java
+++ b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/publishing/PublishingTestFactoryJpa.java
@@ -33,7 +33,7 @@
 
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.services.wrapper.control.AsyncControl;
diff --git a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/rest/JpaRestEndpointService.java b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/rest/JpaRestEndpointService.java
index b8867ed3861..a0b0a805a15 100644
--- a/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/rest/JpaRestEndpointService.java
+++ b/regressiontests/base-jpa/src/main/java/org/apache/causeway/testdomain/jpa/rest/JpaRestEndpointService.java
@@ -42,7 +42,7 @@
 import org.springframework.web.client.RestClient.RequestBodySpec;
 import org.springframework.web.client.RestClient.RequestBodyUriSpec;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.value.semantics.ValueDecomposition;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.functional.Try;
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
index 444c6bd7544..122a309c511 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/RegressionTestAbstract.java
@@ -26,7 +26,7 @@
 
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
index a0e3c68070a..17d7c434e88 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/fixtures/EntityTestFixtures.java
@@ -41,7 +41,7 @@
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.base._Casts;
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
index 4f6ef4be82a..735cf688d35 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/publishing/PublishingTestFactoryAbstract.java
@@ -38,7 +38,7 @@
 
 import org.apache.causeway.applib.annotation.TransactionScope;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.DisabledException;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.applib.services.xactn.TransactionState;
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
index 4e89f0813a0..37d63643b94 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/DomainObjectTesterFactory.java
@@ -47,7 +47,7 @@
 import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.services.command.Command;
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._Strings;
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
index cbf76d1baf0..a2e7945d7ea 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
@@ -33,7 +33,7 @@
 import org.jspecify.annotations.Nullable;
 
 import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.commons.internal.base._NullSafe;
 import org.apache.causeway.commons.internal.base._Strings;
diff --git a/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
index 3b24b9bc08f..ae92182cb59 100644
--- a/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
+++ b/regressiontests/cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
@@ -32,7 +32,7 @@
 import org.apache.causeway.applib.mixins.system.DomainChangeRecord;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 059472afc86..6c11a689e08 100644
--- a/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/regressiontests/domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -46,7 +46,7 @@
 import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.exceptions.unrecoverable.DomainModelException;
 import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.config.CausewayConfiguration;
 import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
 import org.apache.causeway.core.config.metamodel.specloader.IntrospectionMode;
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
index 30da1839a6f..27862e138df 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_notUsingAllowSafeSemantics.java
@@ -33,7 +33,7 @@
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacet;
 import org.apache.causeway.core.security.authorization.Authorizor;
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
index 99643b1c8c6..c6f50fca3c8 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/ActionInteractionTest_usingAllowSafeSemantics.java
@@ -34,7 +34,7 @@
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 import org.apache.causeway.applib.annotation.Where;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacet;
 import org.apache.causeway.core.security.authorization.Authorizor;
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
index e5226e5188d..ca2547b8359 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
@@ -33,7 +33,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
diff --git a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
index 236006453da..deeb866cf7e 100644
--- a/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
+++ b/regressiontests/interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
@@ -29,7 +29,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.TestPropertySource;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
 import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
diff --git a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index 17f1fdbac40..eb102f193ab 100644
--- a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -51,7 +51,7 @@
 import org.apache.causeway.applib.layout.LayoutConstants;
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 87513c71c61..6ea46e9bc11 100644
--- a/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -41,7 +41,7 @@
 import org.apache.causeway.applib.annotation.ActionLayout;
 import org.apache.causeway.applib.layout.LayoutConstants;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.config.presets.CausewayPresets;
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
index 4b1dc99eb32..ee452de46a5 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
@@ -40,7 +40,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import org.apache.causeway.applib.query.Query;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.persistence.jpa.applib.services.JpaSupportService;
 import org.apache.causeway.testdomain.fixtures.EntityTestFixtures.Lock;
 import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 9c6a5e51180..94110d04baf 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -30,7 +30,7 @@
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.internal.base._Refs;
diff --git a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 446ca53eda4..efc6b13c575 100644
--- a/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++ b/regressiontests/persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -29,7 +29,7 @@
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
diff --git a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
index 52926b82fb7..d68a8bc4fc9 100644
--- a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
+++ b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTest.java
@@ -38,7 +38,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 import org.apache.causeway.applib.graph.tree.TreeNode;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
diff --git a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
index d147b260139..f7cc2e63759 100644
--- a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
+++ b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/ValueSemanticsTester.java
@@ -30,8 +30,8 @@
 
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.wrapper.WrapperFactory;
 import org.apache.causeway.applib.value.semantics.OrderRelation;
 import org.apache.causeway.applib.value.semantics.Parser;
diff --git a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/_Utils.java b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/_Utils.java
index 5180fbd6b33..94edd120e3e 100644
--- a/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/_Utils.java
+++ b/regressiontests/value/src/test/java/org/apache/causeway/testdomain/value/_Utils.java
@@ -21,7 +21,7 @@
 import java.util.Locale;
 
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.functional.Try;
 import org.apache.causeway.commons.io.JaxbUtils;
 import org.apache.causeway.commons.io.TextUtils;
diff --git a/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
index 24bdf7e3f31..c4bf6f3d7c1 100644
--- a/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/causeway/security/bypass/authorization/AuthorizorBypass.java
@@ -25,7 +25,7 @@
 
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.security.authorization.Authorizor;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
 
diff --git a/security/simple/src/main/java/org/apache/causeway/security/simple/authentication/SimpleAuthenticator.java b/security/simple/src/main/java/org/apache/causeway/security/simple/authentication/SimpleAuthenticator.java
index 2d2ebfd02eb..6ee7b80d304 100644
--- a/security/simple/src/main/java/org/apache/causeway/security/simple/authentication/SimpleAuthenticator.java
+++ b/security/simple/src/main/java/org/apache/causeway/security/simple/authentication/SimpleAuthenticator.java
@@ -28,7 +28,7 @@
 import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.core.security.authentication.AuthenticationRequest;
diff --git a/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java b/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
index 61b6b03679e..c8ac26c9eda 100644
--- a/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
+++ b/security/simple/src/main/java/org/apache/causeway/security/simple/authorization/SimpleAuthorizor.java
@@ -28,7 +28,7 @@
 
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.core.security.authorization.Authorizor;
 import org.apache.causeway.security.simple.CausewayModuleSecuritySimple;
diff --git a/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java b/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
index 68d22525e28..2fa7146fa41 100644
--- a/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
+++ b/security/simple/src/test/java/org/apache/causeway/security/simple/SecuritySimpleAuthTest.java
@@ -35,7 +35,7 @@
 
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.applib.id.LogicalType;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.core.security.authentication.AuthenticationRequest;
 import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
diff --git a/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java b/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
index aadd0d5a782..a8c91dde77a 100644
--- a/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
+++ b/security/spring/src/main/java/org/apache/causeway/security/spring/authentication/AuthenticatorSpring.java
@@ -25,8 +25,8 @@
 import org.springframework.stereotype.Service;
 
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.core.security.authentication.AuthenticationRequest;
 import org.apache.causeway.core.security.authentication.Authenticator;
 import org.apache.causeway.security.spring.CausewayModuleSecuritySpring;
diff --git a/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/SpringSecurityFilter.java b/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/SpringSecurityFilter.java
index 0d9cb8ccbb1..cf21201945d 100644
--- a/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/SpringSecurityFilter.java
+++ b/security/spring/src/main/java/org/apache/causeway/security/spring/webmodule/SpringSecurityFilter.java
@@ -34,8 +34,8 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.user.UserMemento.AuthenticationSource;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 8b1a72c41c9..11f8911d05c 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -46,7 +46,7 @@
 import org.apache.causeway.applib.annotation.Programmatic;
 import org.apache.causeway.applib.annotation.RestrictTo;
 import org.apache.causeway.applib.services.eventbus.EventBusService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.jaxb.JaxbService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
index 31a0572a687..b5d94c1c646 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
@@ -22,7 +22,7 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
 import org.apache.causeway.commons.functional.Try;
 
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
index 7af28607790..6e22f8725a2 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
@@ -23,7 +23,7 @@
 import org.springframework.context.ApplicationContext;
 
 import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
index cd1a1ea1c66..66c049df2a6 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.assertions._Assert;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.context.MetaModelContextFactory;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
index 1890df8fb04..636005cf3c8 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/_Helper.java
@@ -25,8 +25,8 @@
 import org.springframework.context.ApplicationContext;
 
 import org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.reflection._Annotations;
 import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
 import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAsUtils;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAs.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAs.java
index 47c137da666..ff126da1592 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAs.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAs.java
@@ -25,8 +25,8 @@
 import java.lang.annotation.Target;
 import java.util.Locale;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 
 /**
  * Offers an alternative to {@link InteractionService}'s imperative approach to switch
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
index f67a3ef10e4..74cd8a8dc72 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/annotation/InteractAsUtils.java
@@ -22,7 +22,7 @@
 
 import org.apache.causeway.applib.clock.VirtualClock;
 import org.apache.causeway.applib.locale.UserLocale;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
diff --git a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
index 5ad28f8aba8..f36988ec8a1 100644
--- a/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
+++ b/viewers/graphql/viewer/src/main/java/org/apache/causeway/viewer/graphql/viewer/integration/AsyncExecutionStrategyResolvingWithinInteraction.java
@@ -27,8 +27,8 @@
 
 import org.springframework.stereotype.Service;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.viewer.graphql.applib.auth.UserMementoProvider;
 
 @Service
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/context/ResourceContext_getArg_Test.java
index 79407178b8b..8d181b1ba75 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/causeway/viewer/restfulobjects/rendering/context/ResourceContext_getArg_Test.java
@@ -33,7 +33,7 @@
 
 import org.springframework.web.context.WebApplicationContext;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.execution.InteractionLayerTracker;
 import org.apache.causeway.core.mmtestsupport.MetaModelContext_forTesting;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
index 4e0186350a3..1d2599f9244 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
@@ -22,7 +22,7 @@
 
 import jakarta.inject.Inject;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index 0c527599659..559d6086ac9 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -29,7 +29,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.swagger.Format;
 import org.apache.causeway.applib.services.swagger.SwaggerService;
 import org.apache.causeway.applib.services.swagger.Visibility;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index 6d37cebb0a3..2bc2d178321 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -18,7 +18,7 @@
  */
 package org.apache.causeway.viewer.restfulobjects.viewer.resources;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation;
 import org.apache.causeway.viewer.restfulobjects.applib.Rel;
 import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
index 7df680a81f5..e3e794d72c6 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter.java
@@ -41,7 +41,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter2.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter2.java
index 13db6f63990..808d71ee646 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter2.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/CausewayRestfulObjectsInteractionFilter2.java
@@ -40,7 +40,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategy.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategy.java
index 7db82c05936..2af64b57259 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategy.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategy.java
@@ -21,7 +21,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
 
 /**
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
index 57bca402495..7323b66a101 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyBasicAuth.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.commons.internal.base._Bytes;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.core.security.authentication.AuthenticationRequestPassword;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyUsingSession.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyUsingSession.java
index 04c5cad4322..32bf82235bd 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyUsingSession.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationStrategyUsingSession.java
@@ -22,7 +22,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 
 /**
  * Checks that an already-present {@link InteractionContext authentication} (obtained from the {@link HttpSession}) is
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
index ed6a1f6b751..22bedb2702c 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/causeway/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
@@ -37,8 +37,8 @@
 import org.springframework.web.context.WebApplicationContext;
 
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.execution.InteractionLayerTracker;
 import org.apache.causeway.core.mmtestsupport.MetaModelContext_forTesting;
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/causeway/HasAmendableInteractionContext.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/causeway/HasAmendableInteractionContext.java
index afc454c67e6..9101ffd9709 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/causeway/HasAmendableInteractionContext.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/causeway/HasAmendableInteractionContext.java
@@ -20,10 +20,10 @@
 
 import java.util.function.UnaryOperator;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-
 import org.jspecify.annotations.NonNull;
 
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+
 /**
  * Introduced, to allow for authenticated sessions to be amended with time-zone information
  * (post sign-in).
diff --git a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
index f25dc3ce9f2..ed1956beb5c 100644
--- a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
+++ b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/ui/test/components/scalars/ConverterTester.java
@@ -41,8 +41,8 @@
 import org.apache.causeway.applib.id.LogicalType;
 import org.apache.causeway.applib.locale.UserLocale;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsResolver;
 import org.apache.causeway.commons.functional.ThrowingRunnable;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
index b4dc5c82257..006f9ee7383 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/attributes/temporal/TemporalDecompositionModel.java
@@ -27,9 +27,9 @@
 import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
 import org.apache.causeway.applib.value.semantics.TemporalCharacteristicsProvider.OffsetCharacteristic;
 import org.apache.causeway.applib.value.semantics.TemporalSupport.TemporalDecomposition;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract;
 import org.apache.causeway.commons.functional.Either;
 import org.apache.causeway.commons.internal.assertions._Assert;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 8565d3835fa..53836fdb503 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -21,7 +21,7 @@
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.ValidationError;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.userreg.UserRegistrationService;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.viewer.wicket.ui.validation.ValidatorBase;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 34beca8cf2e..372b2a8db8b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -21,7 +21,7 @@
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.ValidationError;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.userreg.UserRegistrationService;
 import org.apache.causeway.viewer.wicket.ui.validation.ValidatorBase;
 
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index 97d8682db1f..8430b7489ee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -34,7 +34,7 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.ResourceModel;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.userreg.UserDetails;
 import org.apache.causeway.applib.services.userreg.UserRegistrationService;
 import org.apache.causeway.applib.services.xactn.TransactionService;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
index 0d8bb79d643..07448e6ab38 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/CausewaySignInPanel.java
@@ -28,7 +28,7 @@
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.inject.ServiceInjector;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
 import org.apache.causeway.applib.services.user.UserCurrentSessionTimeZoneHolder;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
index 9e2f1d3f04b..65e2e6981f4 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
@@ -32,7 +32,7 @@
 
 import org.apache.causeway.applib.clock.VirtualClock;
 import org.apache.causeway.applib.services.clock.ClockService;
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
 import org.apache.causeway.applib.services.session.SessionSubscriber;
 import org.apache.causeway.applib.services.user.UserMemento;
 import org.apache.causeway.applib.services.user.UserMemento.AuthenticationSource;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
index 9addb48bc23..66f2cc0b69a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/LocalizerForCauseway.java
@@ -35,7 +35,7 @@
 import org.apache.causeway.applib.services.i18n.TranslationContext;
 import org.apache.causeway.applib.services.i18n.TranslationService;
 import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.commons.internal.base._Casts;
 import org.apache.causeway.commons.internal.base._Strings;
 import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketApplication;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/SessionAuthenticator.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/SessionAuthenticator.java
index 4d1e223f174..b8ca4848e2b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/SessionAuthenticator.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/SessionAuthenticator.java
@@ -20,8 +20,8 @@
 
 import java.util.Optional;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionContext;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserService;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
index d38b0743f6b..dd57d840c5b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
@@ -54,7 +54,7 @@
 import org.apache.causeway.applib.services.exceprecog.Recognition;
 import org.apache.causeway.applib.services.i18n.TranslationContext;
 import org.apache.causeway.applib.services.iactn.Interaction;
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.base._Strings;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
index 7d147c8df7f..de98cd054cc 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_Authenticate.java
@@ -32,7 +32,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.user.UserService;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.metamodel.execution.InteractionLayerTracker;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
index 760e7df5a05..ffb05c024ab 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_SignIn.java
@@ -32,7 +32,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
 import org.apache.causeway.core.mmtestsupport.InteractionService_forTesting;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
index 6b23f790051..0636b0fd449 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway_TestAbstract.java
@@ -24,7 +24,7 @@
 import org.apache.wicket.request.Request;
 import org.mockito.Mockito;
 
-import org.apache.causeway.applib.services.iactnlayer.InteractionService;
+import org.apache.causeway.applib.services.iactn.InteractionService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
 import org.apache.causeway.applib.services.session.SessionSubscriber;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;