You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/10/21 08:35:48 UTC

[isis] branch master updated: ISIS-3142: rename IsisIntegrationTestAbstract and CausewayInteractionHandler

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b38049759 ISIS-3142: rename IsisIntegrationTestAbstract and CausewayInteractionHandler
6b38049759 is described below

commit 6b38049759285e56dc9f13eb38aaa16f916d5d28
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 21 10:35:33 2022 +0200

    ISIS-3142: rename IsisIntegrationTestAbstract and
    CausewayInteractionHandler
    
    - also automated rename all file contents of demo
---
 examples/demo/README.adoc                          |  2 +-
 examples/demo/docker-compose.yml                   |  8 +--
 .../domain/tests/conf/Configuration_usingJdo.java  |  6 +--
 .../domain/tests/conf/Configuration_usingJpa.java  |  6 +--
 .../domain/tests/DomainIntrospectionTestJdo.java   | 18 +++----
 .../domain/tests/DomainIntrospectionTestJpa.java   | 18 +++----
 .../src/main/adoc/modules/demo/pages/about.adoc    | 22 ++++----
 .../_infra/resources/AsciiDocReaderService.java    |  2 +-
 .../resources/MarkupVariableResolverService.java   |  6 +--
 .../_interactions/InteractionDtoVm.layout.xml      |  6 +--
 .../associateWith/ActionAssociateWithVm.layout.xml |  6 +--
 .../child/ActionAssociateWithChildVm.layout.xml    |  6 +--
 .../ActionCommandPublishingEntity.layout.xml       |  6 +--
 .../ActionCommandPublishingJdo-description.adoc    | 22 ++++----
 .../ActionCommandPublishingJpa-description.adoc    | 22 ++++----
 .../ActionDomainEventVm-description.adoc           |  6 +--
 .../domainEvent/ActionDomainEventVm.layout.xml     |  6 +--
 .../ActionExecutionPublishingEntity.layout.xml     |  6 +--
 .../ActionExecutionPublishingJdo-description.adoc  |  8 +--
 .../ActionExecutionPublishingJpa-description.adoc  |  8 +--
 .../Action/hidden/ActionHiddenVm.layout.xml        |  6 +--
 .../restrictTo/ActionRestrictToVm.layout.xml       |  6 +--
 .../Action/semantics/ActionSemanticsVm.layout.xml  |  6 +--
 .../Action/typeOf/ActionTypeOfVm.layout.xml        |  6 +--
 .../Action/typeOf/child/ActionTypeOfVm.layout.xml  |  6 +--
 .../position/ActionLayoutPositionVm.layout.xml     |  6 +--
 .../ActionLayoutPromptStyleVm.layout.xml           |  6 +--
 .../assoc/AssociatedActionDemo-description.adoc    |  4 +-
 .../assoc/AssociatedActionDemo.layout.xml          |  8 +--
 .../DependentArgsActionDemo-description.adoc       |  4 +-
 .../depargs/DependentArgsActionDemo.layout.xml     |  8 +--
 .../CollectionDomainEventVm-description.adoc       |  6 +--
 .../domainEvent/CollectionDomainEventVm.layout.xml |  6 +--
 .../child/CollectionDomainEventChildVm.layout.xml  |  6 +--
 ...inObjectEntityChangePublishingEntity.layout.xml |  6 +--
 ...ObjectEntityChangePublishingVm-description.adoc | 10 ++--
 ...DomainObjectEntityChangePublishingVm.layout.xml |  6 +--
 .../jaxbrefentity/StatefulVmJaxbRefsEntity.java    |  4 +-
 .../StatefulVmJaxbRefsEntity.layout.xml            |  4 +-
 .../usingjaxb/StatefulVmUsingJaxb-description.adoc |  4 +-
 .../usingjaxb/StatefulVmUsingJaxb.layout.xml       |  4 +-
 .../other/embedded/EmbeddedTypeVm-description.adoc |  2 +-
 .../other/embedded/EmbeddedTypeVm.layout.xml       |  6 +--
 .../embedded/jdo/NumberConstantJdo.layout.xml      |  6 +--
 .../embedded/jpa/NumberConstantJpa.layout.xml      |  6 +--
 .../other/mixins/FibonacciNumberVm.layout.xml      |  2 +-
 .../domain/objects/other/mixins/MixinVm.layout.xml |  4 +-
 .../PropertyCommandPublishingEntity.layout.xml     |  6 +--
 .../PropertyCommandPublishingJdo-description.adoc  | 22 ++++----
 .../PropertyCommandPublishingJpa-description.adoc  | 22 ++++----
 .../PropertyDomainEventVm-description.adoc         |  6 +--
 .../domainEvent/PropertyDomainEventVm.layout.xml   |  6 +--
 .../editing/PropertyEditingVm-description.adoc     |  2 +-
 .../Property/editing/PropertyEditingVm.layout.xml  |  6 +--
 .../PropertyExecutionPublishingEntity.layout.xml   |  6 +--
 ...PropertyExecutionPublishingJdo-description.adoc |  8 +--
 ...PropertyExecutionPublishingJpa-description.adoc |  8 +--
 .../fileAccept/PropertyFileAcceptVm.layout.xml     |  6 +--
 .../Property/hidden/PropertyHiddenVm.layout.xml    |  6 +--
 .../hidden/child/PropertyHiddenChildVm.layout.xml  |  6 +--
 .../maxLength/PropertyMaxLengthVm.layout.xml       |  6 +--
 .../PropertyMustSatisfyVm-description.adoc         |  6 +--
 .../mustSatisfy/PropertyMustSatisfyVm.layout.xml   |  6 +--
 .../PropertyOptionalityVm-description.adoc         |  2 +-
 .../optionality/PropertyOptionalityVm.layout.xml   |  6 +--
 .../projecting/PropertyProjectingVm.layout.xml     |  6 +--
 .../PropertyProjectingChildEntity.layout.xml       |  6 +--
 .../regexPattern/PropertyRegexPatternVm.layout.xml |  6 +--
 .../snapshot/PropertySnapshotVm-description.adoc   | 24 ++++-----
 .../snapshot/PropertySnapshotVm.layout.xml         |  6 +--
 .../cssClass/PropertyLayoutCssClassVm.layout.xml   |  6 +--
 .../PropertyLayoutDescribedAsVm.layout.xml         |  6 +--
 .../hidden/PropertyLayoutHiddenVm.layout.xml       |  6 +--
 .../child/PropertyLayoutHiddenChildVm.layout.xml   |  6 +--
 .../PropertyLayoutLabelPositionVm-description.adoc |  4 +-
 .../PropertyLayoutLabelPositionVm.layout.xml       |  6 +--
 .../multiLine/PropertyLayoutMultiLineVm.layout.xml |  6 +--
 .../named/PropertyLayoutNamedVm.layout.xml         |  6 +--
 .../PropertyLayout/navigable/FileNodeVm.layout.xml |  6 +--
 .../renderDay/PropertyLayoutRenderDayVm.layout.xml |  6 +--
 .../PropertyLayoutRepaintingVm.layout.xml          |  6 +--
 .../PropertyLayoutTypicalLengthVm.layout.xml       |  6 +--
 .../customui/vm/WhereInTheWorldVm-description.adoc | 12 ++---
 .../layout/describedAs/DescribedAsVm.layout.xml    |  4 +-
 .../dom/featured/layout/tabs/TabDemo.layout.xml    |  4 +-
 .../dom/homepage/DemoHomePage-description.adoc     |  4 +-
 .../demoapp/dom/homepage/DemoHomePage-welcome.adoc |  8 +--
 .../demoapp/dom/homepage/DemoHomePage.layout.xml   |  4 +-
 .../ErrorReportingServiceDemoVm.xml                |  8 +--
 .../EventBusServiceDemoVm.layout.xml               |  4 +-
 .../messageservice/MessageServiceDemoVm.layout.xml |  4 +-
 .../wrapperFactory/WrapperFactoryEntity.layout.xml |  6 +--
 .../XmlSnapshotParentVm.layout.xml                 |  6 +--
 .../child/XmlSnapshotChildVm.layout.xml            |  6 +--
 .../peer/XmlSnapshotPeerVm.layout.xml              |  6 +--
 .../peer/child/XmlSnapshotPeerChildVm.layout.xml   |  6 +--
 .../secman/apptenancy/AppTenancyVm.layout.xml      |  4 +-
 .../secman/appuser/seed/AppUserSeeding.java        |  2 +-
 .../types/causeway/blobs/CausewayBlobs-common.adoc | 16 +++---
 .../causeway/blobs/CausewayBlobs-description.adoc  | 14 +++---
 .../types/causeway/blobs/CausewayBlobs.layout.xml  |  6 +--
 .../blobs/jdo/CausewayBlobJdo-description.adoc     | 12 ++---
 .../blobs/jpa/CausewayBlobJpa-description.adoc     | 12 ++---
 .../persistence/CausewayBlobEntity.layout.xml      |  6 +--
 .../blobs/samples/CausewayBlobsSamples.java        |  2 +-
 .../blobs/vm/CausewayBlobVm-description.adoc       | 10 ++--
 .../causeway/blobs/vm/CausewayBlobVm.layout.xml    |  6 +--
 .../types/causeway/clobs/CausewayClobs-common.adoc | 16 +++---
 .../causeway/clobs/CausewayClobs-description.adoc  | 14 +++---
 .../types/causeway/clobs/CausewayClobs.layout.xml  |  6 +--
 .../clobs/jdo/CausewayClobJdo-description.adoc     | 12 ++---
 .../clobs/jpa/CausewayClobJpa-description.adoc     | 12 ++---
 .../persistence/CausewayClobEntity.layout.xml      |  6 +--
 .../clobs/vm/CausewayClobVm-description.adoc       |  8 +--
 .../causeway/clobs/vm/CausewayClobVm.layout.xml    |  6 +--
 .../CausewayLocalResourcePaths-common.adoc         | 16 +++---
 .../CausewayLocalResourcePaths-description.adoc    | 16 +++---
 .../CausewayLocalResourcePaths.layout.xml          |  6 +--
 .../CausewayLocalResourcePathJdo-description.adoc  | 12 ++---
 .../CausewayLocalResourcePathJpa-description.adoc  | 12 ++---
 .../CausewayLocalResourcePathEntity.layout.xml     |  6 +--
 .../CausewayLocalResourcePathVm-description.adoc   |  8 +--
 .../vm/CausewayLocalResourcePathVm.layout.xml      |  6 +--
 .../passwords/CausewayPasswords-common.adoc        | 16 +++---
 .../passwords/CausewayPasswords-description.adoc   | 14 +++---
 .../passwords/CausewayPasswords.layout.xml         |  6 +--
 .../jdo/CausewayPasswordJdo-description.adoc       | 10 ++--
 .../jpa/CausewayPasswordJpa-description.adoc       | 10 ++--
 .../persistence/CausewayPasswordEntity.layout.xml  |  6 +--
 .../vm/CausewayPasswordVm-description.adoc         |  8 +--
 .../passwords/vm/CausewayPasswordVm.layout.xml     |  6 +--
 .../cal/CausewayCalendarEvents-common.adoc         | 16 +++---
 .../cal/CausewayCalendarEvents-description.adoc    | 12 ++---
 .../cal/CausewayCalendarEvents.layout.xml          |  6 +--
 .../jdo/CausewayCalendarEventJdo-description.adoc  | 10 ++--
 .../jpa/CausewayCalendarEventJpa-description.adoc  | 10 ++--
 .../CausewayCalendarEventEntity.layout.xml         |  6 +--
 .../vm/CausewayCalendarEventVm-description.adoc    |  8 +--
 .../cal/vm/CausewayCalendarEventVm.layout.xml      |  6 +--
 .../causewayext/sse/AsyncActionDemo.layout.xml     |  8 +--
 .../images/JavaAwtBufferedImages-description.adoc  |  4 +-
 .../images/JavaAwtBufferedImages.layout.xml        |  6 +--
 .../jdo/JavaAwtBufferedImageJdo-description.adoc   |  6 +--
 .../jpa/JavaAwtBufferedImageJpa-description.adoc   |  6 +--
 .../JavaAwtBufferedImageEntity.layout.xml          |  6 +--
 .../vm/JavaAwtBufferedImageVm-description.adoc     |  4 +-
 .../images/vm/JavaAwtBufferedImageVm.layout.xml    |  6 +--
 .../types/javalang/voids/JavaLangVoids.layout.xml  |  6 +--
 .../bigdecimals/JavaMathBigDecimals.layout.xml     |  6 +--
 .../jdo/JavaMathBigDecimalJdo-description.adoc     |  8 +--
 .../jpa/JavaMathBigDecimalJpa-description.adoc     |  8 +--
 .../JavaMathBigDecimalEntity.layout.xml            |  6 +--
 .../vm/JavaMathBigDecimalVm-description.adoc       |  6 +--
 .../bigdecimals/vm/JavaMathBigDecimalVm.layout.xml |  6 +--
 .../bigintegers/JavaMathBigIntegers.layout.xml     |  6 +--
 .../jdo/JavaMathBigIntegerJdo-description.adoc     |  8 +--
 .../jpa/JavaMathBigIntegerJpa-description.adoc     |  8 +--
 .../JavaMathBigIntegerEntity.layout.xml            |  6 +--
 .../vm/JavaMathBigIntegerVm-description.adoc       |  6 +--
 .../bigintegers/vm/JavaMathBigIntegerVm.layout.xml |  6 +--
 .../dom/types/javanet/urls/JavaNetUrls.layout.xml  |  6 +--
 .../urls/jdo/JavaNetUrlJdo-description.adoc        |  8 +--
 .../urls/jpa/JavaNetUrlJpa-description.adoc        |  8 +--
 .../urls/persistence/JavaNetUrlEntity.layout.xml   |  6 +--
 .../javanet/urls/vm/JavaNetUrlVm-description.adoc  |  6 +--
 .../types/javanet/urls/vm/JavaNetUrlVm.layout.xml  |  6 +--
 .../javasql/javasqldate/JavaSqlDates.layout.xml    |  6 +--
 .../jdo/JavaSqlDateJdo-description.adoc            |  8 +--
 .../jpa/JavaSqlDateJpa-description.adoc            |  8 +--
 .../persistence/JavaSqlDateEntity.layout.xml       |  6 +--
 .../javasqldate/vm/JavaSqlDateVm-description.adoc  |  8 +--
 .../javasqldate/vm/JavaSqlDateVm.layout.xml        |  6 +--
 .../javasqltimestamp/JavaSqlTimestamps.layout.xml  |  6 +--
 .../jdo/JavaSqlTimestampJdo-description.adoc       |  8 +--
 .../jpa/JavaSqlTimestampJpa-description.adoc       |  8 +--
 .../persistence/JavaSqlTimestampEntity.layout.xml  |  6 +--
 .../vm/JavaSqlTimestampVm-description.adoc         |  8 +--
 .../vm/JavaSqlTimestampVm.layout.xml               |  6 +--
 .../JavaTimeLocalDates.layout.xml                  |  6 +--
 .../jdo/JavaTimeLocalDateJdo-description.adoc      |  8 +--
 .../jpa/JavaTimeLocalDateJpa-description.adoc      |  8 +--
 .../persistence/JavaTimeLocalDateEntity.layout.xml |  6 +--
 .../vm/JavaTimeLocalDateVm-description.adoc        |  8 +--
 .../vm/JavaTimeLocalDateVm.layout.xml              |  6 +--
 .../JavaTimeLocalDateTimes.layout.xml              |  6 +--
 .../jdo/JavaTimeLocalDateTimeJdo-description.adoc  |  8 +--
 .../jpa/JavaTimeLocalDateTimeJpa-description.adoc  |  8 +--
 .../JavaTimeLocalDateTimeEntity.layout.xml         |  6 +--
 .../vm/JavaTimeLocalDateTimeVm-description.adoc    |  8 +--
 .../vm/JavaTimeLocalDateTimeVm.layout.xml          |  6 +--
 .../JavaTimeLocalTimes.layout.xml                  |  6 +--
 .../jdo/JavaTimeLocalTimeJdo-description.adoc      |  8 +--
 .../jpa/JavaTimeLocalTimeJpa-description.adoc      |  8 +--
 .../persistence/JavaTimeLocalTimeEntity.layout.xml |  6 +--
 .../vm/JavaTimeLocalTimeVm-description.adoc        |  8 +--
 .../vm/JavaTimeLocalTimeVm.layout.xml              |  6 +--
 .../JavaTimeOffsetDateTimes.layout.xml             |  6 +--
 .../jdo/JavaTimeOffsetDateTimeJdo-description.adoc |  8 +--
 .../jpa/JavaTimeOffsetDateTimeJpa-description.adoc |  8 +--
 .../JavaTimeOffsetDateTimeEntity.layout.xml        |  6 +--
 .../vm/JavaTimeOffsetDateTimeVm-description.adoc   |  8 +--
 .../vm/JavaTimeOffsetDateTimeVm.layout.xml         |  6 +--
 .../JavaTimeOffsetTimes.layout.xml                 |  6 +--
 .../jdo/JavaTimeOffsetTimeJdo-description.adoc     |  8 +--
 .../jpa/JavaTimeOffsetTimeJpa-description.adoc     |  8 +--
 .../JavaTimeOffsetTimeEntity.layout.xml            |  6 +--
 .../vm/JavaTimeOffsetTimeVm-description.adoc       |  8 +--
 .../vm/JavaTimeOffsetTimeVm.layout.xml             |  6 +--
 .../JavaTimeZonedDateTimes.layout.xml              |  6 +--
 .../jdo/JavaTimeZonedDateTimeJdo-description.adoc  |  8 +--
 .../jpa/JavaTimeZonedDateTimeJpa-description.adoc  |  8 +--
 .../JavaTimeZonedDateTimeEntity.layout.xml         |  6 +--
 .../vm/JavaTimeZonedDateTimeVm-description.adoc    |  8 +--
 .../vm/JavaTimeZonedDateTimeVm.layout.xml          |  6 +--
 .../javautil/javautildate/JavaUtilDates.layout.xml |  6 +--
 .../jdo/JavaUtilDateJdo-description.adoc           |  8 +--
 .../jpa/JavaUtilDateJpa-description.adoc           |  8 +--
 .../persistence/JavaUtilDateEntity.layout.xml      |  6 +--
 .../vm/JavaUtilDateVm-description.adoc             |  8 +--
 .../javautildate/vm/JavaUtilDateVm.layout.xml      |  6 +--
 .../jodatime/jodadatetime/JodaDateTimes.layout.xml |  6 +--
 .../jdo/JodaDateTimeJdo-description.adoc           |  8 +--
 .../persistence/JodaDateTimeEntity.layout.xml      |  6 +--
 .../vm/JodaDateTimeVm-description.adoc             |  8 +--
 .../jodadatetime/vm/JodaDateTimeVm.layout.xml      |  6 +--
 .../jodalocaldate/JodaLocalDates.layout.xml        |  6 +--
 .../jdo/JodaLocalDateJdo-description.adoc          |  8 +--
 .../persistence/JodaLocalDateEntity.layout.xml     |  6 +--
 .../vm/JodaLocalDateVm-description.adoc            |  8 +--
 .../jodalocaldate/vm/JodaLocalDateVm.layout.xml    |  6 +--
 .../JodaLocalDateTimes.layout.xml                  |  6 +--
 .../jdo/JodaLocalDateTimeJdo-description.adoc      |  6 +--
 .../persistence/JodaLocalDateTimeEntity.layout.xml |  6 +--
 .../vm/JodaLocalDateTimeVm-description.adoc        |  8 +--
 .../vm/JodaLocalDateTimeVm.layout.xml              |  6 +--
 .../persistence/JodaLocalTimeEntity.layout.xml     |  6 +--
 .../domain/src/main/resources/META-INF/MANIFEST.MF |  6 +--
 .../demo/domain/src/main/resources/application.yml | 20 ++++----
 .../config/application-primary.properties          |  2 +-
 .../config/application-secondary.properties        |  8 +--
 .../domain/src/main/resources/templates/error.html |  4 +-
 .../main/java/demoapp/javafx/DemoAppJavaFx.java    |  2 +-
 .../javafx/integtest/DemoFxTestAbstract.java       |  4 +-
 examples/demo/pom.xml                              |  8 +--
 examples/demo/pre-flight.adoc                      | 58 +++++++++++-----------
 examples/demo/vaadin/pom.xml                       |  4 +-
 .../java/demoapp/webapp/vaadin/DemoAppVaadin.java  |  8 +--
 .../common/src/main/resources/static/index.html    | 18 +++----
 examples/demo/wicket/jdo/pom.xml                   |  2 +-
 .../webapp/wicket/jdo/DemoAppWicketJdo.java        |  2 +-
 .../jdo/src/main/resources/log4j2-spring.xml       |  4 +-
 .../jdo/src/test/e2e/cypress/integration/login.ts  |  4 +-
 examples/demo/wicket/jpa-and-graphql/pom.xml       |  2 +-
 .../webapp/wicket/jpa/DemoAppWicketJpa.java        |  8 +--
 .../src/resources/log4j2-spring.xml                |  4 +-
 examples/demo/wicket/jpa/pom.xml                   |  2 +-
 .../webapp/wicket/jpa/DemoAppWicketJpa.java        |  8 +--
 .../wicket/jpa/src/resources/log4j2-spring.xml     |  4 +-
 .../integtest/CommandLog_IntegTestAbstract.java    |  4 +-
 .../integtest/ExecutionLog_IntegTestAbstract.java  |  4 +-
 .../ExecutionOutbox_IntegTestAbstract.java         |  4 +-
 .../integtests/AuditTrail_IntegTestAbstract.java   |  4 +-
 ...ationPermissionRepositoryIntegTestAbstract.java |  4 +-
 .../integtests/SessionLogIntegTestAbstract.java    |  4 +-
 .../testdomain/wrapper/WrapperAsyncTest.java       |  4 +-
 .../CmdExecAuditSessLog_IntegTestAbstract.java     |  4 +-
 .../domainmodel/DomainModelTest_forEditing.java    |  4 +-
 .../testdomain/factory/ViewModelFactoryTest.java   |  4 +-
 .../testdomain/interact/CustomContextTest.java     |  4 +-
 .../integtest/Layout_Counter_IntegTest.java        |  4 +-
 .../integtest/Layout_SimpleObject_IntegTest.java   |  4 +-
 .../injecting/jdo/JdoEntityInjectingTest.java      |  4 +-
 .../persistence/jdo/JdoBootstrappingTest.java      |  4 +-
 .../testdomain/persistence/jdo/JdoQueryTest.java   |  4 +-
 .../timestamping/jdo/JdoTimestampingTest.java      |  4 +-
 .../testdomain/wrapper/jdo/JdoWrapperSyncTest.java |  4 +-
 .../injecting/jpa/JpaEntityInjectingTest.java      |  4 +-
 .../persistence/jpa/JpaBootstrappingTest.java      |  4 +-
 .../testdomain/persistence/jpa/JpaQueryTest.java   |  4 +-
 .../springdata/SpringDataJpaBootstrappingTest.java |  4 +-
 ...actionRollbackTest_usingInteractionService.java |  4 +-
 ...actionRollbackTest_usingTransactionService.java |  4 +-
 ...TransactionRollbackTest_usingTransactional.java |  4 +-
 .../jpa/JpaTransactionScopeListenerTest.java       |  4 +-
 .../util/interaction/InteractionTestAbstract.java  |  4 +-
 .../IsisIntegrationTestAbstractWithFixtures.java   |  4 +-
 ...t.java => CausewayIntegrationTestAbstract.java} |  4 +-
 ...andler.java => CausewayInteractionHandler.java} |  2 +-
 .../testing/integtestsupport/applib/_Helper.java   |  6 +--
 289 files changed, 1019 insertions(+), 1019 deletions(-)

diff --git a/examples/demo/README.adoc b/examples/demo/README.adoc
index 37ea7dc5e6..1b04d2e0f2 100644
--- a/examples/demo/README.adoc
+++ b/examples/demo/README.adoc
@@ -3,6 +3,6 @@
 
 
 :demo_module_root: domain/src/main/adoc/modules/demo
-image:https://github.com/apache-isis-committers/isis-nightly/workflows/Nightly/badge.svg[link="https://github.com/apache-isis-committers/isis-nightly/actions?query=workflow%3A%22Nightly%22"]
+image:https://github.com/apache-causeway-committers/causeway-nightly/workflows/Nightly/badge.svg[link="https://github.com/apache-causeway-committers/causeway-nightly/actions?query=workflow%3A%22Nightly%22"]
 
 include::{demo_module_root}/pages/about.adoc[]
diff --git a/examples/demo/docker-compose.yml b/examples/demo/docker-compose.yml
index 11bbffe50f..f11e3de8b4 100644
--- a/examples/demo/docker-compose.yml
+++ b/examples/demo/docker-compose.yml
@@ -20,19 +20,19 @@
 version: "3.8"
 services:
   primary:
-    image: "apacheisis/demo-wicket-jdo:latest"
+    image: "apachecauseway/demo-wicket-jdo:latest"
     environment:
       - PROTOTYPING=true
       - SPRING_PROFILES_ACTIVE=primary
     ports:
       - "8080:8080"
   secondary:
-    image: "apacheisis/demo-wicket-jdo:latest"
+    image: "apachecauseway/demo-wicket-jdo:latest"
     environment:
       - PROTOTYPING=true
       - SPRING_PROFILES_ACTIVE=secondary
-      - ISIS_EXTENSIONS_COMMANDREPLAY_PRIMARYACCESS_BASEURLRESTFUL=http://primary:8080/restful/
-      - ISIS_EXTENSIONS_COMMANDREPLAY_PRIMARYACCESS_BASEURLWICKET=http://primary:8080/wicket/
+      - CAUSEWAY_EXTENSIONS_COMMANDREPLAY_PRIMARYACCESS_BASEURLRESTFUL=http://primary:8080/restful/
+      - CAUSEWAY_EXTENSIONS_COMMANDREPLAY_PRIMARYACCESS_BASEURLWICKET=http://primary:8080/wicket/
     ports:
       - "9090:9090"
     depends_on:
diff --git a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
index 689474e37b..4282f0c5aa 100644
--- a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
+++ b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJdo.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 import org.apache.causeway.persistence.jdo.datanucleus.CausewayModulePersistenceJdoDatanucleus;
 import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@@ -43,8 +43,8 @@ import demoapp.web.DemoAppManifestJdo;
     DemoAppManifestJdo.class,
 })
 @PropertySources({
-    @PropertySource(IsisPresets.NoTranslations),
-    @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+    @PropertySource(CausewayPresets.NoTranslations),
+    @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
 })
 @Profile("demo-jdo")
 public class Configuration_usingJdo {
diff --git a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
index fb25c6bb2e..6b25a2b7c4 100644
--- a/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
+++ b/examples/demo/domain-tests/src/main/java/demoapp/dom/domain/tests/conf/Configuration_usingJpa.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
 import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
 import org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
@@ -43,8 +43,8 @@ import demoapp.web.DemoAppManifestJpa;
     DemoAppManifestJpa.class,
 })
 @PropertySources({
-    @PropertySource(IsisPresets.NoTranslations),
-    @PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
+    @PropertySource(CausewayPresets.NoTranslations),
+    @PropertySource(CausewayPresets.H2InMemory_withUniqueSchema),
 })
 @Profile("demo-jpa")
 public class Configuration_usingJpa {
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
index cfe7867821..6c5bebb39a 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJdo.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.TestPropertySource;
 
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator;
 
@@ -45,15 +45,15 @@ import lombok.val;
                 Configuration_usingJdo.class,
         },
         properties = {
-                "isis.core.meta-model.introspector.mode=FULL",
-                //"isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
-                "isis.applib.annotation.domain-object.editing=TRUE",
-                "isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
+                "causeway.core.meta-model.introspector.mode=FULL",
+                //"causeway.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
+                "causeway.applib.annotation.domain-object.editing=TRUE",
+                "causeway.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
                 "logging.level.DependentArgUtils=DEBUG"
         })
 @TestPropertySource({
-    IsisPresets.SilenceMetaModel,
-    IsisPresets.SilenceProgrammingModel
+    CausewayPresets.SilenceMetaModel,
+    CausewayPresets.SilenceProgrammingModel
 })
 @ActiveProfiles(profiles = "demo-jdo")
 class DomainIntrospectionTestJdo {
@@ -63,7 +63,7 @@ class DomainIntrospectionTestJdo {
     @Inject private ServiceRegistry serviceRegistry;
     @Inject private SpecificationLoader specificationLoader;
     //@Inject private TitleService titleService;
-    //@Inject private CausewayConfiguration isisConfig;
+    //@Inject private CausewayConfiguration causewayConfig;
     //@Inject private DomainObjectTesterFactory testerFactory;
 
     @Test
@@ -86,4 +86,4 @@ class DomainIntrospectionTestJdo {
         new MetaModelExportToConsole().export(metaModelService.getDomainModel());
     }
 
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
index 3ae1c157dc..762254f7a3 100644
--- a/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
+++ b/examples/demo/domain-tests/src/test/java/demoapp/dom/domain/tests/DomainIntrospectionTestJpa.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.TestPropertySource;
 
 import org.apache.causeway.applib.services.metamodel.MetaModelService;
 import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.core.config.presets.IsisPresets;
+import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.testing.integtestsupport.applib.validate.DomainModelValidator;
 
@@ -45,15 +45,15 @@ import lombok.val;
                 Configuration_usingJpa.class,
         },
         properties = {
-                "isis.core.meta-model.introspector.mode=FULL",
-                //"isis.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
-                "isis.applib.annotation.domain-object.editing=TRUE",
-                "isis.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
+                "causeway.core.meta-model.introspector.mode=FULL",
+                //"causeway.core.config.configuration-property-visibility-policy=ALWAYS_SHOW",
+                "causeway.applib.annotation.domain-object.editing=TRUE",
+                "causeway.core.meta-model.validator.explicit-object-type=FALSE", // does not override any of the imports
                 "logging.level.DependentArgUtils=DEBUG"
         })
 @TestPropertySource({
-    IsisPresets.SilenceMetaModel,
-    IsisPresets.SilenceProgrammingModel
+    CausewayPresets.SilenceMetaModel,
+    CausewayPresets.SilenceProgrammingModel
 })
 @ActiveProfiles(profiles = "demo-jpa")
 class DomainIntrospectionTestJpa {
@@ -63,7 +63,7 @@ class DomainIntrospectionTestJpa {
     @Inject private ServiceRegistry serviceRegistry;
     @Inject private SpecificationLoader specificationLoader;
     //@Inject private TitleService titleService;
-    //@Inject private CausewayConfiguration isisConfig;
+    //@Inject private CausewayConfiguration causewayConfig;
     //@Inject private DomainObjectTesterFactory testerFactory;
 
     @Test
@@ -86,4 +86,4 @@ class DomainIntrospectionTestJpa {
         new MetaModelExportToConsole().export(metaModelService.getDomainModel());
     }
 
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
index 6849c5ac0c..321094c158 100644
--- a/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
+++ b/examples/demo/domain/src/main/adoc/modules/demo/pages/about.adoc
@@ -2,14 +2,14 @@
 
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The Demo app provides an introduction to the Apache Isis programming model, allowing you to learn the basics with a minimum of hassle.
-It's also a useful reference to help you develop your own Apache Isis applications.
+The Demo app provides an introduction to the Apache Causeway programming model, allowing you to learn the basics with a minimum of hassle.
+It's also a useful reference to help you develop your own Apache Causeway applications.
 
 
 image::teaser-light.png[]
 
-The application is packaged up as a Docker image (link:https://hub.docker.com/r/apacheisis/demo-wicket-jdo/tags/[apacheisis/demo-wicket-jdo] or link:https://hub.docker.com/r/apacheisis/demo-wicket-jpa/tags/[apacheisis/demo-wicket-jpa]) on Docker Hub, so you can easily run it yourself (as described <<Running the Docker Image,below>>).
-You can see also try out the application online, link:https://demo-wicket.jdo.isis.incode.work[jdo] or link:https://demo-wicket.jpa.isis.incode.work[jpa].
+The application is packaged up as a Docker image (link:https://hub.docker.com/r/apachecauseway/demo-wicket-jdo/tags/[apachecauseway/demo-wicket-jdo] or link:https://hub.docker.com/r/apachecauseway/demo-wicket-jpa/tags/[apachecauseway/demo-wicket-jpa]) on Docker Hub, so you can easily run it yourself (as described <<Running the Docker Image,below>>).
+You can see also try out the application online, link:https://demo-wicket.jdo.causeway.incode.work[jdo] or link:https://demo-wicket.jpa.causeway.incode.work[jpa].
 
 == Prereqs
 
@@ -24,15 +24,15 @@ Assuming the `jdo` variant (if using `jpa`, just substitute "jdo" with "jpa" in
 +
 [source,bash]
 ----
-docker pull apacheisis/demo-wicket-jdo:latest
+docker pull apachecauseway/demo-wicket-jdo:latest
 ----
 
 * Running the Docker Image
 +
 [source,bash]
 ----
-docker pull apacheisis/demo-wicket-jdo:latest
-docker run -d -p8080:8080 apacheisis/demo-wicket-jdo:latest
+docker pull apachecauseway/demo-wicket-jdo:latest
+docker run -d -p8080:8080 apachecauseway/demo-wicket-jdo:latest
 ----
 +
 The Demo app can then be accessed at http://localhost:8080/wicket/[].
@@ -53,13 +53,13 @@ Assuming the `jdo` variant (if using `jpa`, just substitute "jdo" with "jpa" in
 * Prototyping mode
 +
 ----
-docker run -d -p8080:8080 -ePROTOTYPING=true apacheisis/demo-wicket-jdo:latest
+docker run -d -p8080:8080 -ePROTOTYPING=true apachecauseway/demo-wicket-jdo:latest
 ----
 
 * Attached console
 +
 ----
-docker run -it -p8080:8080 apacheisis/demo-wicket-jdo:latest
+docker run -it -p8080:8080 apachecauseway/demo-wicket-jdo:latest
 ----
 +
 Use CTRL-C to stop and detach
@@ -69,7 +69,7 @@ TIP: on Windows, you might need to prefix with `winpty`.
 * Specify a different context Path
 +
 ----
-docker run -d -p8080:8080 -eContextPath=/myPath apacheisis/demo-wicket-jdo:latest
+docker run -d -p8080:8080 -eContextPath=/myPath apachecauseway/demo-wicket-jdo:latest
 ----
 +
 then access at http://localhost:8080/myPath/wicket/[].
@@ -78,7 +78,7 @@ then access at http://localhost:8080/myPath/wicket/[].
 
 If you like to get involved quickly, please feel free to open new pull requests (at github) or just join the discussion and provide feedback.
 
-If you are interested in contributing to Apache Isis, see the xref:conguide:ROOT:about.adoc[Contributors' Guide] for details.
+If you are interested in contributing to Apache Causeway, see the xref:conguide:ROOT:about.adoc[Contributors' Guide] for details.
 
 
 == Credits
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
index 81dc994b2c..54139564ce 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/AsciiDocReaderService.java
@@ -65,7 +65,7 @@ public class AsciiDocReaderService {
     }
 
     private String replaceVersion(final String adoc) {
-        return adoc.replace("{isis-version}",
+        return adoc.replace("{causeway-version}",
                 configuration.getViewer().getWicket().getApplication().getVersion());
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
index c20ba95c58..1a500b3a37 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkupVariableResolverService.java
@@ -41,10 +41,10 @@ public class MarkupVariableResolverService {
     @Inject
     public MarkupVariableResolverService(CausewayConfiguration configuration) {
         constants = _Maps.unmodifiable(
-                "SOURCES_ISIS", "https://github.com/apache/isis/blob/master/core/applib/src/main/java",
-                "SOURCES_DEMO", "https://github.com/apache/isis/tree/master/examples/demo/domain/src/main/java",
+                "SOURCES_CAUSEWAY", "https://github.com/apache/causeway/blob/master/core/applib/src/main/java",
+                "SOURCES_DEMO", "https://github.com/apache/causeway/tree/master/examples/demo/domain/src/main/java",
                 "ISSUES_DEMO", "https://issues.apache.org/jira/",
-                "ISIS_VERSION", Optional.ofNullable(
+                "CAUSEWAY_VERSION", Optional.ofNullable(
                         configuration.getViewer().getWicket().getApplication().getVersion())
                         .orElse("unkown-version")
             );
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
index 7e698d659a..93a6a84531 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.layout.xml
index 9e19ba8bf9..f6913256ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
index d585ea464e..9779b9fb8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity.layout.xml
index 5e77de1af2..5815dec099 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo-description.adoc
index 7edf0b4553..45bbc60868 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo-description.adoc
@@ -2,11 +2,11 @@
 
 The `command` element is used to allow or suppress the reification of an action invocation into a xref:refguide:applib:index/services/command/Command.adoc[Command].
 
-When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandServiceListener.html#section-top[CommandServiceListener] SPI, _after_ the interaction has completed.
+When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandServiceListener.html#section-top[CommandServiceListener] SPI, _after_ the interaction has completed.
 One use case is to replicate and replay commands to a secondary system, for example for regression testing.
 For more on this, see the "Command Replay" section below.
 
-Commands are also used under the covers to allow actions invocations to be made asynchronously using the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
+Commands are also used under the covers to allow actions invocations to be made asynchronously using the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
 This can be useful for long-running actions.
 
 [NOTE]
@@ -111,7 +111,7 @@ include::../ActionCommandPublishingEntity_mixinUpdatePropertyMetaAnnotationOverr
 
 == CommandSubscriber
 
-The demo includes the link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
+The demo includes the link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
 These can be viewed in the collection at the left bottom of the page.
 xref:refguide:applib:index/services/command/Command.adoc[Command]s are persisted after the page rendering phase, so to view a just-persisted command, refresh the page.
 
@@ -124,7 +124,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       action:
@@ -140,13 +140,13 @@ In other words actions are reified to commands except for those that don't chang
 //
 //== Command Replay
 //
-//The link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
+//The link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
 //It also provides a RESTful endpoint to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be queried.
-//This is used by the link:https://isis.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
+//This is used by the link:https://causeway.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
 //
 //The associated `commandDtoProcessor()` element allows the xref:refguide:applib:index/services/command/Command.adoc[Command] XML representation (as a `CommandDto`) to be processed before being surfaced through the REST endpoint.
 //One use case is to allow data to be obfuscated for security, or to replace large payloads (such as Blobs) with a smaller dummy payload.
-//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
+//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
 //
 //The command replay can be demonstrated by running a second instance of the demo app, using the "secondary" Spring Boot profile.
 //This is most easily done by specifying a system property:
@@ -157,10 +157,10 @@ In other words actions are reified to commands except for those that don't chang
 //
 //[source,properties]
 //----
-//isis.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
-//isis.extensions.commandreplay.primary-access.user=sven
-//isis.extensions.commandreplay.primary-access.password=pass
-//isis.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
+//causeway.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
+//causeway.extensions.commandreplay.primary-access.user=sven
+//causeway.extensions.commandreplay.primary-access.password=pass
+//causeway.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
 //
 //server.port=9090
 //----
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa-description.adoc
index 102aae1829..1badd95913 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa-description.adoc
@@ -2,11 +2,11 @@
 
 The `command` element is used to allow or suppress the reification of an action invocation into a xref:refguide:applib:index/services/command/Command.adoc[Command].
 
-When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandServiceListener.html#section-top[CommandServiceListener] SPI, _after_ the interaction has completed.
+When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandServiceListener.html#section-top[CommandServiceListener] SPI, _after_ the interaction has completed.
 One use case is to replicate and replay commands to a secondary system, for example for regression testing.
 For more on this, see the "Command Replay" section below.
 
-Commands are also used under the covers to allow actions invocations to be made asynchronously using the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
+Commands are also used under the covers to allow actions invocations to be made asynchronously using the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
 This can be useful for long-running actions.
 
 [NOTE]
@@ -111,7 +111,7 @@ include::../ActionCommandPublishingEntity_mixinUpdatePropertyMetaAnnotationOverr
 
 == CommandSubscriber
 
-The demo includes the link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
+The demo includes the link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
 These can be viewed in the collection at the left bottom of the page.
 xref:refguide:applib:index/services/command/Command.adoc[Command]s are persisted after the page rendering phase, so to view a just-persisted command, refresh the page.
 
@@ -124,7 +124,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       action:
@@ -140,13 +140,13 @@ In other words actions are reified to commands except for those that don't chang
 //
 //== Command Replay
 //
-//The link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
+//The link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
 //It also provides a RESTful endpoint to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be queried.
-//This is used by the link:https://isis.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
+//This is used by the link:https://causeway.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
 //
 //The associated `commandDtoProcessor()` element allows the xref:refguide:applib:index/services/command/Command.adoc[Command] XML representation (as a `CommandDto`) to be processed before being surfaced through the REST endpoint.
 //One use case is to allow data to be obfuscated for security, or to replace large payloads (such as Blobs) with a smaller dummy payload.
-//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
+//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
 //
 //The command replay can be demonstrated by running a second instance of the demo app, using the "secondary" Spring Boot profile.
 //This is most easily done by specifying a system property:
@@ -157,10 +157,10 @@ In other words actions are reified to commands except for those that don't chang
 //
 //[source,properties]
 //----
-//isis.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
-//isis.extensions.commandreplay.primary-access.user=sven
-//isis.extensions.commandreplay.primary-access.password=pass
-//isis.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
+//causeway.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
+//causeway.extensions.commandreplay.primary-access.user=sven
+//causeway.extensions.commandreplay.primary-access.password=pass
+//causeway.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
 //
 //server.port=9090
 //----
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm-description.adoc
index fac820e5d8..bebba1dad4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm-description.adoc
@@ -10,14 +10,14 @@ Domain service subscribers can influence this interaction, either by:
 * performing arbitrary operations after the action has been modified (including changing the apparent return value of the action)
 
 
-The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.isis.applib.events.domain.ActionDomainEvent` class.
+The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.causeway.applib.events.domain.ActionDomainEvent` class.
 
 If no `domainEvent` is specified on the action itself, then the domain event class can be specified at the class level using `@DomainObject#actionDomainEvent`.
-And if not specified at the class level, then an instance of `org.apache.isis.applib.events.domain.ActionDomainEvent.Default` is emitted as the fallback.
+And if not specified at the class level, then an instance of `org.apache.causeway.applib.events.domain.ActionDomainEvent.Default` is emitted as the fallback.
 
 [TIP]
 ====
-The fallback domain event can be suppressed using the `isis.applib.annotation.action.domain-event.post-for-default` configuration property.
+The fallback domain event can be suppressed using the `causeway.applib.annotation.action.domain-event.post-for-default` configuration property.
 ====
 
 == Annotated Actions
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.layout.xml
index 7d8c0b9854..36cef1a1e3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity.layout.xml
index 7e698d659a..93a6a84531 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo-description.adoc
index f10c9454d4..92e22cfa52 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo-description.adoc
@@ -2,13 +2,13 @@
 
 WARNING: TODO publishing was renamed to executionPublishing
 
-The `publishing` element specifies that the invocation of an object action should be published to registered implementation(s) of link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI].
+The `publishing` element specifies that the invocation of an object action should be published to registered implementation(s) of link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI].
 
 This is performed _after_ the action has been invoked.
 
 The publishing from the framework to the SPI is in-memory.
 A typical SPI implementation would then publish over the network, or perhaps store in a database.
-(Note that the framework provides an link:https://isis.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
+(Note that the framework provides an link:https://causeway.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
 
 The element can be specified using either the `@Action` annotation, or through a meta-annotation.
 
@@ -99,7 +99,7 @@ include::../ActionExecutionPublishingEntity_mixinUpdatePropertyMetaAnnotationOve
 //----
 //include::spiimpl/PublisherServiceSpiForActions.java[tags=class]
 //----
-//<.> serializes to `InteractionDto`, as defined by the link:https://isis.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Isis schema].
+//<.> serializes to `InteractionDto`, as defined by the link:https://causeway.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Causeway schema].
 //
 //The demo implementation also provides a way to query these executions:
 //
@@ -133,7 +133,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       action:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa-description.adoc
index 2503661801..2aadfdfb44 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa-description.adoc
@@ -2,13 +2,13 @@
 
 WARNING: TODO publishing was renamed to executionPublishing
 
-The `publishing` element specifies that the invocation of an object action should be published to registered implementation(s) of link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI].
+The `publishing` element specifies that the invocation of an object action should be published to registered implementation(s) of link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI].
 
 This is performed _after_ the action has been invoked.
 
 The publishing from the framework to the SPI is in-memory.
 A typical SPI implementation would then publish over the network, or perhaps store in a database.
-(Note that the framework provides an link:https://isis.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
+(Note that the framework provides an link:https://causeway.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
 
 The element can be specified using either the `@Action` annotation, or through a meta-annotation.
 
@@ -99,7 +99,7 @@ include::../ActionExecutionPublishingEntity_mixinUpdatePropertyMetaAnnotationOve
 //----
 //include::spiimpl/PublisherServiceSpiForActions.java[tags=class]
 //----
-//<.> serializes to `InteractionDto`, as defined by the link:https://isis.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Isis schema].
+//<.> serializes to `InteractionDto`, as defined by the link:https://causeway.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Causeway schema].
 //
 //The demo implementation also provides a way to query these executions:
 //
@@ -133,7 +133,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       action:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.layout.xml
index 942f01f852..737a57bbe2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.layout.xml
index 4eeeecfe5a..c4c2f1c6db 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.layout.xml
index 91cef8de27..9490d14af6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.layout.xml
index 9e19ba8bf9..f6913256ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
index d585ea464e..9779b9fb8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.layout.xml
index 219f349d21..3720409904 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
index 0e7facd613..0d90204c94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc
index 302602c76f..70351e4b55 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc
@@ -5,8 +5,8 @@
 
 The framework allows an action to be associated with other properties or
 collections of the same domain object. For complete reference see the
-https://isis.apache.org/guides/rgant/rgant.html#_rgant-Action_associateWith[Apache
-Isis Reference Guide]
+https://causeway.apache.org/guides/rgant/rgant.html#_rgant-Action_associateWith[Apache
+Causeway Reference Guide]
 
 We setup a simple `FibonacciNumberVm` class to demonstrate this.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml
index 638e27bc88..92290bf1be 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-		xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-		xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-		xmlns:cpt="http://isis.apache.org/applib/layout/component"
+		xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+		xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+		xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="12" unreferencedActions="true">
@@ -39,4 +39,4 @@
 		</bs3:col>
 	</bs3:row>
 
-</bs3:grid>
\ No newline at end of file
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc
index 9acf356a38..c43b0cecfe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc
@@ -2,7 +2,7 @@
 
 (since 1.18.0 and 2.0.0-M3)
 
-Known issues link:https://issues.apache.org/jira/browse/ISIS-2319[ISIS-2319]
+Known issues link:https://issues.apache.org/jira/browse/CAUSEWAY-2319[CAUSEWAY-2319]
 
 [source,java]
 ----
@@ -21,4 +21,4 @@ public List<Y> choices1Act(X param0) { // <.>
 <.> Choices for param1 depend on the user specified param0.
 
 See the associated action demo
-link:${SOURCES_DEMO}/demoapp/dom/actions/depargs[sources].
\ No newline at end of file
+link:${SOURCES_DEMO}/demoapp/dom/actions/depargs[sources].
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml
index 246fee7b03..fe2373d1e1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-		xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-		xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-		xmlns:cpt="http://isis.apache.org/applib/layout/component"
+		xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+		xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+		xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="12" unreferencedActions="true">
@@ -64,4 +64,4 @@
 		
 	</bs3:row>
 
-</bs3:grid>
\ No newline at end of file
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm-description.adoc
index 2a556bc6d6..16ea3c7810 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm-description.adoc
@@ -7,15 +7,15 @@ Domain service subscribers can influence these interaction by subscribing to the
 
 (In contrast to properties), because collections can only be modified indirectly (eg through an action), there are no other interactions that can be influenced.
 
-The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.isis.applib.events.domain.CollectionDomainEvent` class.
+The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.causeway.applib.events.domain.CollectionDomainEvent` class.
 
 If no `domainEvent` is specified on the property itself, then the domain event class can be specified at the class level using `@DomainObject#collectionDomainEvent`.
 
-And if not specified at the class level, then an instance of `org.apache.isis.applib.events.domain.CollectionDomainEvent.Default` is emitted as the fallback.
+And if not specified at the class level, then an instance of `org.apache.causeway.applib.events.domain.CollectionDomainEvent.Default` is emitted as the fallback.
 
 [TIP]
 ====
-The fallback domain event can be suppressed using the `isis.applib.annotation.collection.domain-event.post-for-default` configuration property.
+The fallback domain event can be suppressed using the `causeway.applib.annotation.collection.domain-event.post-for-default` configuration property.
 ====
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.layout.xml
index b49f7d2f00..043d50614c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.layout.xml
index a1dd799a49..962c44a6fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.layout.xml
index 38a73394a2..295b8e7caa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
index adce41dbbc..f1978e07ae 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm-description.adoc
@@ -2,17 +2,17 @@
 
 WARNING: TODO: was renamed/moved from auditing+publishing to entityChangePublishing
 
-The `entityChangePublishing` element for a domain object means that all registered implementation(s) of the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI] will be notified of the identity and nature of the change (created/updated/deleted) to the domain object.
+The `entityChangePublishing` element for a domain object means that all registered implementation(s) of the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/PublisherService.html#spi[`PublisherService` SPI] will be notified of the identity and nature of the change (created/updated/deleted) to the domain object.
 
 :examples/demo/domain/src/main/java/demoapp/dom/annotDomain/DomainObject/publishing/DomainObjectPublishingVm-description.adoc
 This is done _after_ the interaction in which the object(s) was changed has completed.
 
 This notification is done only once per interaction, so will include _all_ domain objects that were changed.
-The event object can be converted to type xref:https://isis.apache.org/refguide/2.0.0-M3/schema/chg.html[ChangesDto].
+The event object can be converted to type xref:https://causeway.apache.org/refguide/2.0.0-M3/schema/chg.html[ChangesDto].
 
 Common use cases are to replicate data to another system, or for gathering metrics ("which objects change the most?").
 A typical SPI implementation could publish the event over the network, or perhaps store in a database.
-(Note that the framework provides an link:https://isis.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
+(Note that the framework provides an link:https://causeway.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
 
 The element can be specified using either the `@DomainObject` annotation, or through a meta-annotation.
 
@@ -43,7 +43,7 @@ TIP: Click through to the entity objects to see examples of the annotations appl
 //----
 //include::spiimpl/PublisherServiceSpiForDomainObject.java[tags=class]
 //----
-//<.> serializes to `ChangesDto`, as defined by the link:https://isis.apache.org/refguide/2.0.0-M3/schema/chg.html[Apache Isis schema].
+//<.> serializes to `ChangesDto`, as defined by the link:https://causeway.apache.org/refguide/2.0.0-M3/schema/chg.html[Apache Causeway schema].
 //
 //The demo implementation also provides a way to query these executions:
 //
@@ -87,7 +87,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       domain-object:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.layout.xml
index 39ae370494..30e316f7a6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
index ca0ae8e7d7..4383fd8e1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
@@ -103,7 +103,7 @@ public class StatefulVmJaxbRefsEntity implements HasAsciiDocDescription {
 
 //end::class[]
 
-    //XXX[ISIS-2384] potentially fails with NPE
+    //XXX[CAUSEWAY-2384] potentially fails with NPE
     @Action(choicesFrom = "children")
     public StatefulVmJaxbRefsEntity suffixSelected(final List<JaxbRefEntity> children) {
         for(JaxbRefEntity child : children) {
@@ -124,7 +124,7 @@ public class StatefulVmJaxbRefsEntity implements HasAsciiDocDescription {
         return this;
     }
 
-    //XXX[ISIS-2383] in support of an editable property ...
+    //XXX[CAUSEWAY-2383] in support of an editable property ...
     @MemberSupport public List<JaxbRefEntity> choicesFavoriteChild() {
         return choices0ChangeFavoriteChild(); // reuse logic from above
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.layout.xml
index 3d2a4fccd4..0cd46b0af2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 >
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
index 4a55786b43..81bb3c0c8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
@@ -1,6 +1,6 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-End users interact with link:https://isis.apache.org/userguide/${ISIS_VERSION}/fun/overview.html#view-models[view models] in the same way as domain entities.
+End users interact with link:https://causeway.apache.org/userguide/${CAUSEWAY_VERSION}/fun/overview.html#view-models[view models] in the same way as domain entities.
 
 However, whereas domain entities are mapped to a datastore, view models are not.
 Instead they are recreated dynamically by serializing their state, typically into the URL itself.
@@ -44,5 +44,5 @@ NOTE: the child object has value-type semantics (is annotated with `@lombok.Data
 == Long URLs
 
 As you can see this can result in long URLs.
-If the URL is too long, or needs to be encrypted, then the link:https://isis.apache.org/refguide/${ISIS_VERSION}/applib-svc/UrlEncodingService.html[UrlEncodingService] SPI can provide for different serializations.
+If the URL is too long, or needs to be encrypted, then the link:https://causeway.apache.org/refguide/${CAUSEWAY_VERSION}/applib-svc/UrlEncodingService.html[UrlEncodingService] SPI can provide for different serializations.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.layout.xml
index ac78956444..16ba8424d2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc
index ad12a2c1f7..a9a89e5efd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc
@@ -7,7 +7,7 @@ They can also have custom behaviour.
 However, they are not quite true value types as the ORM needs to update their fields directly.
 Ensuring that The mutator method can be made `private`
 
-CAUTION: This is still work in progress, see link:https://issues.apache.org/jira/browse/ISIS-1695[ISIS-1695].
+CAUTION: This is still work in progress, see link:https://issues.apache.org/jira/browse/CAUSEWAY-1695[CAUSEWAY-1695].
 
 == View model and collection
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml
index 67167eb300..0a4e049001 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <bs3:row>
         <bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml
index 9a2ff98915..fb98d4ccd0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-	xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-	xmlns:cpt="http://isis.apache.org/applib/layout/component"
+	xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+	xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml
index 9a2ff98915..fb98d4ccd0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-	xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-	xmlns:cpt="http://isis.apache.org/applib/layout/component"
+	xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+	xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml
index 994cf82115..64f28ca6a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml
@@ -9,7 +9,7 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+<bs3:grid xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd http://causeway.apache.org/applib/layout/links http://causeway.apache.org/applib/layout/links/links.xsd http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://causeway.apache.org/appli [...]
     <bs3:row>
         <bs3:col span="12" unreferencedActions="true">
             <cpt:domainObject bookmarking="AS_ROOT"/>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml
index e1ec13a61d..f2a223733e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity.layout.xml
index 95338df800..e6e61d3498 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo-description.adoc
index 33c6d803b7..783dd1d18e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo-description.adoc
@@ -3,11 +3,11 @@
 The `commandPublishing` element is used to allow or suppress the reification of a property edit into a xref:refguide:applib:index/services/command/Command.adoc[Command].
 
 
-When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://isis.apache.org/refguide/2.0.0-M5/applib-svc/CommandSubscriber.html#section-top[CommandSubscriber] SPI, _after_ the interaction has completed.
+When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://causeway.apache.org/refguide/2.0.0-M5/applib-svc/CommandSubscriber.html#section-top[CommandSubscriber] SPI, _after_ the interaction has completed.
 One use case is to replicate and replay commands to a secondary system, for example for regression testing.
 For more on this, see the "Command Replay" section below.
 
-Commands are also used under the covers to allow property edits to be made asynchronously using the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
+Commands are also used under the covers to allow property edits to be made asynchronously using the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
 
 [NOTE]
 ====
@@ -73,7 +73,7 @@ include::PropertyCommandPublishingJdo.java[tags=meta-annotation-overridden]
 
 == CommandSubscriber
 
-The demo includes the link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
+The demo includes the link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
 These can be viewed in the collection at the bottom of the left page.
 xref:refguide:applib:index/services/command/Command.adoc[Command]s are persisted after the page rendering phase, so to view a just-persisted command, refresh the page.
 
@@ -86,7 +86,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       property:
@@ -99,13 +99,13 @@ In other words actions are reified to commands except for those that don't chang
 
 == Command Replay
 
-The link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
+The link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
 It also provides a RESTful endpoint to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be queried.
-This is used by the link:https://isis.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
+This is used by the link:https://causeway.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
 
 The associated `commandDtoProcessor()` element allows the xref:refguide:applib:index/services/command/Command.adoc[Command] XML representation (as a `CommandDto`) to be processed before being surfaced through the REST endpoint.
 One use case is to allow data to be obfuscated for security, or to replace large payloads (such as Blobs) with a smaller dummy payload.
-As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
+As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
 
 The command replay can be demonstrated by running a second instance of the demo app, using the "secondary" Spring Boot profile.
 This is most easily done by specifying a system property:
@@ -116,10 +116,10 @@ This activates the `application-secondary.properties` configuration file:
 
 [source,properties]
 ----
-isis.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
-isis.extensions.commandreplay.primary-access.user=sven
-isis.extensions.commandreplay.primary-access.password=pass
-isis.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
+causeway.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
+causeway.extensions.commandreplay.primary-access.user=sven
+causeway.extensions.commandreplay.primary-access.password=pass
+causeway.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
 
 server.port=9090
 ----
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa-description.adoc
index 0397733273..4e931c8670 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa-description.adoc
@@ -3,11 +3,11 @@
 The `commandPublishing` element is used to allow or suppress the reification of a property edit into a xref:refguide:applib:index/services/command/Command.adoc[Command].
 
 
-When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://isis.apache.org/refguide/2.0.0-M5/applib-svc/CommandSubscriber.html#section-top[CommandSubscriber] SPI, _after_ the interaction has completed.
+When allowed (the default), then the xref:refguide:applib:index/services/command/Command.adoc[Command] is sent to registered implementation(s) of https://causeway.apache.org/refguide/2.0.0-M5/applib-svc/CommandSubscriber.html#section-top[CommandSubscriber] SPI, _after_ the interaction has completed.
 One use case is to replicate and replay commands to a secondary system, for example for regression testing.
 For more on this, see the "Command Replay" section below.
 
-Commands are also used under the covers to allow property edits to be made asynchronously using the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
+Commands are also used under the covers to allow property edits to be made asynchronously using the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/WrapperFactory.html[WrapperFactory].
 
 [NOTE]
 ====
@@ -73,7 +73,7 @@ include::PropertyCommandPublishingJpa.java[tags=meta-annotation-overridden]
 
 == CommandSubscriber
 
-The demo includes the link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
+The demo includes the link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension, so every command is persisted.
 These can be viewed in the collection at the bottom of the left page.
 xref:refguide:applib:index/services/command/Command.adoc[Command]s are persisted after the page rendering phase, so to view a just-persisted command, refresh the page.
 
@@ -86,7 +86,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       property:
@@ -102,13 +102,13 @@ In other words actions are reified to commands except for those that don't chang
 //
 //== Command Replay
 //
-//The link:https://isis.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
+//The link:https://causeway.apache.org/extensions/2.0.0-M3/commandlog/about.html[Command Log] extension provides an implementation of `CommandServiceListener` to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be persisted.
 //It also provides a RESTful endpoint to allow xref:refguide:applib:index/services/command/Command.adoc[Command]s to be queried.
-//This is used by the link:https://isis.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
+//This is used by the link:https://causeway.apache.org/extensions/2.0.0-M3/commandreplay/about.html[Command Replay] extension to allow commands to be replayed on a secondary system, for regression testing.
 //
 //The associated `commandDtoProcessor()` element allows the xref:refguide:applib:index/services/command/Command.adoc[Command] XML representation (as a `CommandDto`) to be processed before being surfaced through the REST endpoint.
 //One use case is to allow data to be obfuscated for security, or to replace large payloads (such as Blobs) with a smaller dummy payload.
-//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://isis.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
+//As well as specifying DTO processing at the action level, it can be specified globally by implementing the link:https://causeway.apache.org/refguide/2.0.0-M3/applib-svc/CommandDtoProcessorService.html[CommandDtoProcessorService] SPI.
 //
 //The command replay can be demonstrated by running a second instance of the demo app, using the "secondary" Spring Boot profile.
 //This is most easily done by specifying a system property:
@@ -119,10 +119,10 @@ In other words actions are reified to commands except for those that don't chang
 //
 //[source,properties]
 //----
-//isis.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
-//isis.extensions.commandreplay.primary-access.user=sven
-//isis.extensions.commandreplay.primary-access.password=pass
-//isis.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
+//causeway.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
+//causeway.extensions.commandreplay.primary-access.user=sven
+//causeway.extensions.commandreplay.primary-access.password=pass
+//causeway.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
 //
 //server.port=9090
 //----
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm-description.adoc
index b1b81ce63f..62bf0fe850 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm-description.adoc
@@ -9,14 +9,14 @@ Domain service subscribers can influence these interaction by subscribing to the
 * perform arbitrary operations before the property has been modified (including modifying the proposed value of the property)
 * perform arbitrary operations after the property has been modified
 
-The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.isis.applib.events.domain.PropertyDomainEvent` class.
+The `domainEvent` element specifies the class to be emitted; this must be a subclass of the abstract `org.apache.causeway.applib.events.domain.PropertyDomainEvent` class.
 
 If no `domainEvent` is specified on the property itself, then the domain event class can be specified at the class level using `@DomainObject#propertyDomainEvent`.
-And if not specified at the class level, then an instance of `org.apache.isis.applib.events.domain.PropertyDomainEvent.Default` is emitted as the fallback.
+And if not specified at the class level, then an instance of `org.apache.causeway.applib.events.domain.PropertyDomainEvent.Default` is emitted as the fallback.
 
 [TIP]
 ====
-The fallback domain event can be suppressed using the `isis.applib.annotation.property.domain-event.post-for-default` configuration property.
+The fallback domain event can be suppressed using the `causeway.applib.annotation.property.domain-event.post-for-default` configuration property.
 ====
 
 == Annotated Property
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.layout.xml
index 8d6763fd25..6adb53d406 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm-description.adoc
index 768ed7bc9d..02574e66ac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm-description.adoc
@@ -9,7 +9,7 @@ There is no corresponding element for parameters, parameters are implicitly edit
 == Class Level
 
 Usually editing of properties is discouraged; it is usually better to modify state through an explicit action instead.
-For that reason, editing of properties is disabled by default (though that can be changed globally if necessary using the `isis.applib.annotation.domain-object.editing` configuration property).
+For that reason, editing of properties is disabled by default (though that can be changed globally if necessary using the `causeway.applib.annotation.domain-object.editing` configuration property).
 
 Editing can also be specified at the class level.
 This will override any configured defaults, but just for the properties of that class:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.layout.xml
index fbf863c303..2e15b5e957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity.layout.xml
index 7e698d659a..93a6a84531 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo-description.adoc
index 79875b1e6e..d8156d84af 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo-description.adoc
@@ -1,12 +1,12 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The `executionPublishing` element specifies that the editing of an object property should be published to registered implementation(s) of link:https://isis.apache.org/refguide/2.0.0-M5/applib-svc/ExecutionSubscriber.html#spi[`ExecutionSubscriber` SPI].
+The `executionPublishing` element specifies that the editing of an object property should be published to registered implementation(s) of link:https://causeway.apache.org/refguide/2.0.0-M5/applib-svc/ExecutionSubscriber.html#spi[`ExecutionSubscriber` SPI].
 
 This is performed _after_ the property has been changed.
 
 The publishing from the framework to the SPI is in-memory.
 A typical SPI implementation would then publish over the network, or perhaps store in a database.
-(Note that the framework provides an link:https://isis.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
+(Note that the framework provides an link:https://causeway.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
 
 The element can be specified using either the `@Property` annotation, or through a meta-annotation.
 
@@ -70,7 +70,7 @@ The demo provides a simple implementation of `PublisherService` that just stores
 ----
 include::spiimpl/PublisherServiceSpiForProperties.java[tags=class]
 ----
-<.> serializes to `InteractionDto`, as defined by the link:https://isis.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Isis schema].
+<.> serializes to `InteractionDto`, as defined by the link:https://causeway.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Causeway schema].
 
 The demo implementation also provides a way to query these executions:
 
@@ -105,7 +105,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       property:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa-description.adoc
index 6e38f782fc..4a573d480f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa-description.adoc
@@ -1,12 +1,12 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The `executionPublishing` element specifies that the editing of an object property should be published to registered implementation(s) of link:https://isis.apache.org/refguide/2.0.0-M5/applib-svc/ExecutionSubscriber.html#spi[`ExecutionSubscriber` SPI].
+The `executionPublishing` element specifies that the editing of an object property should be published to registered implementation(s) of link:https://causeway.apache.org/refguide/2.0.0-M5/applib-svc/ExecutionSubscriber.html#spi[`ExecutionSubscriber` SPI].
 
 This is performed _after_ the property has been changed.
 
 The publishing from the framework to the SPI is in-memory.
 A typical SPI implementation would then publish over the network, or perhaps store in a database.
-(Note that the framework provides an link:https://isis.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
+(Note that the framework provides an link:https://causeway.apache.org/mappings/2.0.0-M3/outbox-publisher/about.html[out-of-the-box implementation] of the link:https://microservices.io/patterns/data/transactional-outbox.html[outbox pattern]).
 
 The element can be specified using either the `@Property` annotation, or through a meta-annotation.
 
@@ -70,7 +70,7 @@ The demo provides a simple implementation of `PublisherService` that just stores
 ----
 include::spiimpl/PublisherServiceSpiForProperties.java[tags=class]
 ----
-<.> serializes to `InteractionDto`, as defined by the link:https://isis.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Isis schema].
+<.> serializes to `InteractionDto`, as defined by the link:https://causeway.apache.org/refguide/2.0.0-M3/schema/ixn.html[Apache Causeway schema].
 
 The demo implementation also provides a way to query these executions:
 
@@ -105,7 +105,7 @@ This can be configured globally:
 [source,yaml]
 .application.yml
 ----
-isis:
+causeway:
   applib:
     annotation:
       property:
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.layout.xml
index fbf863c303..2e15b5e957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.layout.xml
index 02976c6a81..8c68c5aad1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
index a3abecb713..918a91e449 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.layout.xml
index fbf863c303..2e15b5e957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm-description.adoc
index 239b621b7a..307a8afa3f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm-description.adoc
@@ -6,7 +6,7 @@ The `mustSatisfy` element specifies an arbitrary constraint that the value enter
 
 * for parameters, the element can be specified using either the `@Parameter` annotation, or a meta-annotation.
 
-The constraint is provided as a concrete class that implements the `org.apache.isis.applib.spec.Specification` interface.
+The constraint is provided as a concrete class that implements the `org.apache.causeway.applib.spec.Specification` interface.
 This is usually done by subclassing `AbstractSpecification` or `AbstractSpecification2`:
 
 [source,java,indent=0]
@@ -50,7 +50,7 @@ The annotation could also be applied to a mixin, but would have little effect be
 
 == Meta-annotated
 
-CAUTION: this feature is currently broken, see link:https://issues.apache.org/jira/browse/ISIS-2415[ISIS-2415].
+CAUTION: this feature is currently broken, see link:https://issues.apache.org/jira/browse/CAUSEWAY-2415[CAUSEWAY-2415].
 
 The `mustSatisfy` element can also be specified using a custom meta-annotation:
 
@@ -84,7 +84,7 @@ include::PropertyMustSatisfyVm_updateWithMetaAnnotation.java[tags=meta-annotatio
 
 === Meta-annotated Overridden
 
-CAUTION: this feature is currently broken, see link:https://issues.apache.org/jira/browse/ISIS-2415[ISIS-2415].
+CAUTION: this feature is currently broken, see link:https://issues.apache.org/jira/browse/CAUSEWAY-2415[CAUSEWAY-2415].
 
 The meta-annotation can itself be overridden:
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.layout.xml
index fbf863c303..2e15b5e957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm-description.adoc
index 56140493f5..ff829bb4dd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm-description.adoc
@@ -17,7 +17,7 @@ In addition to specifying optionality at the framework level, it's also importan
 * in the case of entities persisted using JDO/DataNucleus, this can be done using `@Column(allowsNull=...)`.
 * in the case of view models serialized using JAXB, this can be done using `@XmlElement(required=...)`.
 
-Also note that JDO and JAXB assume a property is not required by default, whereas Apache Isis assumes that properties are required by default.
+Also note that JDO and JAXB assume a property is not required by default, whereas Apache Causeway assumes that properties are required by default.
 ====
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.layout.xml
index 278341ada9..294c9082e9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 1<bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.layout.xml
index 10c4769daf..8488185b0c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
index c1a202a40f..ba0178a25a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/persistence/PropertyProjectingChildEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.layout.xml
index fbf863c303..2e15b5e957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm-description.adoc
index 8d18cc2a27..163f6e85b5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm-description.adoc
@@ -90,19 +90,19 @@ The resultant XML snapshot is:
 ----
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <app:PropertySnapshotVm
-    xmlns:app="..." xmlns:isis="..." xmlns:xsi="..."
-    isis:feature="class"
-    isis:fqn="demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotVm"
-    isis:oid="demo.PropertySnapshotVm:..."
-    isis:plural="Property Snapshot Vms"
-    isis:singular="Property Snapshot Vm"
+    xmlns:app="..." xmlns:causeway="..." xmlns:xsi="..."
+    causeway:feature="class"
+    causeway:fqn="demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotVm"
+    causeway:oid="demo.PropertySnapshotVm:..."
+    causeway:plural="Property Snapshot Vms"
+    causeway:singular="Property Snapshot Vm"
     xsi:schemaLocation="... demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotVm.xsd">
-  <isis:title>PropertySnapshotVm</isis:title>
-  <app:notSpecifiedProperty isis:datatype="isis:String" isis:feature="value">value</app:notSpecifiedProperty>
-  <app:includedProperty isis:datatype="isis:String" isis:feature="value">value</app:includedProperty>
-  <app:objectType isis:datatype="isis:String" isis:feature="value">demo.PropertySnapshotVm</app:objectType>
-  <app:objectIdentifier isis:datatype="isis:String" isis:feature="value">»3a1ba25e</app:objectIdentifier>
-  <app:text isis:datatype="isis:String" isis:feature="value">value</app:text>
+  <causeway:title>PropertySnapshotVm</causeway:title>
+  <app:notSpecifiedProperty causeway:datatype="causeway:String" causeway:feature="value">value</app:notSpecifiedProperty>
+  <app:includedProperty causeway:datatype="causeway:String" causeway:feature="value">value</app:includedProperty>
+  <app:objectType causeway:datatype="causeway:String" causeway:feature="value">demo.PropertySnapshotVm</app:objectType>
+  <app:objectIdentifier causeway:datatype="causeway:String" causeway:feature="value">»3a1ba25e</app:objectIdentifier>
+  <app:text causeway:datatype="causeway:String" causeway:feature="value">value</app:text>
 </app:PropertySnapshotVm>
 ----
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.layout.xml
index 50eb0d69f5..75498d4f12 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
index 446a1b1688..f3ca2b38cd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.layout.xml
index a0b4f69634..f910790cbb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.layout.xml
index 220382ad9b..b087f3a24d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
index 3057851e75..1f25f9f767 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm-description.adoc
index a4a7ca1541..580be287bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm-description.adoc
@@ -233,6 +233,6 @@ include::PropertyLayoutLabelPositionVm_updateVariantNotSpecified.java[tags=annot
 The default position itself can be configured globally, in the `application.yml` or `application.properties` configuration file.
 This is done using:
 
-* `isis.applib.annotation.property-layout.label-position` configuration property for properties, and
-* `isis.applib.annotation.parameter-layout.label-position` configuration property for parameters.
+* `causeway.applib.annotation.property-layout.label-position` configuration property for properties, and
+* `causeway.applib.annotation.parameter-layout.label-position` configuration property for parameters.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.layout.xml
index 9255793a1d..812440cfe4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.layout.xml
index aeab841b0f..d7c94e422a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
index 83f281537b..97d25c267d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.layout.xml
index 9102fc2fa7..313210a189 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.layout.xml
index 1303e52a62..4d3e908eaa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.layout.xml
index 31f8370609..95bcaeecfc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.layout.xml
index a79d5e984a..fff28eb704 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm-description.adoc
index 67198b4b9a..acc2978e44 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/customui/vm/WhereInTheWorldVm-description.adoc
@@ -1,6 +1,6 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The link:https://isis.apache.org/vw/{isis-version}/about.html[Wicket viewer] renders the generic UI for entities and view models using a series of Wicket ``Component``s, with each such `Component` created by a `ComponentFactory`.
+The link:https://causeway.apache.org/vw/{causeway-version}/about.html[Wicket viewer] renders the generic UI for entities and view models using a series of Wicket ``Component``s, with each such `Component` created by a `ComponentFactory`.
 
 You can customise the UI by providing alternate implementations of `ComponentFactory`, for any component on the page, including the top-level component for the entire domain object.
 
@@ -33,7 +33,7 @@ include::WhereInTheWorldVm.java[tags=class]
 
 To provide a custom component, we need to implement the `o.a.i.viewer.wicket.ui.ComponentFactory` interface, as a domain service.
 
-TIP: For more on this topic, see the link:https://isis.apache.org/vw/{isis-version}/extending.html#replacing-page-elements[Wicket viewer documentation].
+TIP: For more on this topic, see the link:https://causeway.apache.org/vw/{causeway-version}/extending.html#replacing-page-elements[Wicket viewer documentation].
 
 There are various subclasses available; as we want to replace the component for the entire entity, we can subclass from `EntityComponentFactoryAbstract`:
 
@@ -137,13 +137,13 @@ It does however mean that we had to tweak the classpath to bring in a dependency
 ----
 <dependencies>
     <dependency>
-        <groupId>org.apache.isis.viewer</groupId>
-        <artifactId>isis-viewer-wicket-model</artifactId>
+        <groupId>org.apache.causeway.viewer</groupId>
+        <artifactId>causeway-viewer-wicket-model</artifactId>
         <optional>true</optional>	<!--1-->
     </dependency>
     <dependency>
-        <groupId>org.apache.isis.viewer</groupId>
-        <artifactId>isis-viewer-wicket-ui</artifactId>
+        <groupId>org.apache.causeway.viewer</groupId>
+        <artifactId>causeway-viewer-wicket-ui</artifactId>
         <optional>true</optional>	<!--1-->
     </dependency>
 </dependencies>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.layout.xml
index 8b6cbe7218..b1e232a6c4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="12" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
index 11fe968aea..08daaddd92 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
@@ -9,8 +9,8 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-          xmlns:cpt="http://isis.apache.org/applib/layout/component"
+<bs3:grid xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+          xmlns:cpt="http://causeway.apache.org/applib/layout/component"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <bs3:row>
         <bs3:col span="12" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
index 6dd155130c..60eb69ae41 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
@@ -1,6 +1,6 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Apache Isis applications can nominate a view model to act as the home page, using the link:https://isis.apache.org/refguide/${ISIS_VERSION}/applib-ant/HomePage.html[@HomePage] annotation:
+Apache Causeway applications can nominate a view model to act as the home page, using the link:https://causeway.apache.org/refguide/${CAUSEWAY_VERSION}/applib-ant/HomePage.html[@HomePage] annotation:
 
 [source,java]
 ----
@@ -18,6 +18,6 @@ This application's home page is pretty simple, not much more than a couple of ha
 A more common implementation of a home page is as a dashboard, displaying the most useful current information to the user (perhaps a task list, or alerts).
 Such a home page would have a number of repository services injected into it, in order to query and render those tasks or alerts.
 
-It would probably also have the framework's link:https://isis.apache.org/refguide/${ISIS_VERSION}/applib-svc/UserService.html[UserService] injected, in order that the information displayed is relevant to the current user.
+It would probably also have the framework's link:https://causeway.apache.org/refguide/${CAUSEWAY_VERSION}/applib-svc/UserService.html[UserService] injected, in order that the information displayed is relevant to the current user.
 As you can see, this app's home page does actually do this, in order to "personalise" the title.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-welcome.adoc b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-welcome.adoc
index 75165870cf..04c9d0562b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-welcome.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-welcome.adoc
@@ -1,12 +1,12 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-This is an link:https://isis.apache.org[Apache Isis] application to demonstrate the programming model for the various features provided by the framework.
+This is an link:https://causeway.apache.org[Apache Causeway] application to demonstrate the programming model for the various features provided by the framework.
 
 On the left hand side of each web page you'll find the feature, and on the right hand side you'll find an explanation of the feature with code examples.
 
 == Page Layout
 
-This is as good place as any to explain the page layout of an Apache Isis webapp:
+This is as good place as any to explain the page layout of an Apache Causeway webapp:
 
 * At the top is the menu bar.
 +
@@ -33,5 +33,5 @@ The demo app uses an in-memory database, so any changes made will be lost when t
 
 == Getting Help and Assistance
 
-There is plenty of documentation on our link:https://isis.apache.org/docs/${ISIS_VERSION}/about.html[website].
-Also subscribe to our link:https://isis.apache.org/docs/${ISIS_VERSION}/support/mailing-list.html[mailing list] or join our link:https://isis.apache.org/docs/${ISIS_VERSION}/support/slack-channel.html[Slack channel].
+There is plenty of documentation on our link:https://causeway.apache.org/docs/${CAUSEWAY_VERSION}/about.html[website].
+Also subscribe to our link:https://causeway.apache.org/docs/${CAUSEWAY_VERSION}/support/mailing-list.html[mailing list] or join our link:https://causeway.apache.org/docs/${CAUSEWAY_VERSION}/support/slack-channel.html[Slack channel].
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
index e9b88610c2..25aa472ef3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.xml
index 1401f2f439..aca501d29a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-		xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-		xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-		xmlns:cpt="http://isis.apache.org/applib/layout/component"
+		xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+		xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+		xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="12" unreferencedActions="true">
@@ -37,4 +37,4 @@
 		</bs3:col>
 	</bs3:row>
 
-</bs3:grid>
\ No newline at end of file
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.layout.xml
index 59fd5cd137..1aba58f225 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.layout.xml
@@ -9,8 +9,8 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-          xmlns:cpt="http://isis.apache.org/applib/layout/component"
+<bs3:grid xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+          xmlns:cpt="http://causeway.apache.org/applib/layout/component"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <bs3:row>
         <bs3:col span="12" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.layout.xml
index 7180690d05..382c587f8d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.layout.xml
@@ -9,8 +9,8 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-          xmlns:cpt="http://isis.apache.org/applib/layout/component"
+<bs3:grid xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+          xmlns:cpt="http://causeway.apache.org/applib/layout/component"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <bs3:row>
         <bs3:col span="12" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryEntity.layout.xml
index f678ad93bb..bcd41853be 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.layout.xml
index a7640cd7eb..3165b270e9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
index d585ea464e..9779b9fb8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
index cad9fe1849..cd4e258c92 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
index d585ea464e..9779b9fb8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.layout.xml
index de8da81f40..40e367e25e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.layout.xml
@@ -10,8 +10,8 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 >
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
index 834244917c..9becb17899 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
@@ -45,7 +45,7 @@ extends SeedServiceAbstract {
             @Override protected void execute(final ExecutionContext executionContext) {
                 executionContext.executeChildren(this,
                         newRole("demo", Can.of(ApplicationFeatureId.newNamespace("demo"))),
-                        newUser("bob", Can.of("isis-ext-secman-admin", "demo"), user->{
+                        newUser("bob", Can.of("causeway-ext-secman-admin", "demo"), user->{
                             user.setLanguage(Locale.GERMAN);
                             user.setNumberFormat(Locale.GERMAN);
                             user.setTimeFormat(Locale.GERMAN);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-common.adoc
index 507fb2150d..5330a0413b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-common.adoc
@@ -2,28 +2,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisBlobHolder` interface, demonstrate the use of `Blob` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayBlobHolder` interface, demonstrate the use of `Blob` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisBlobHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayBlobHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayBlobHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisBlobHolder_actionReturning.java[tags=class]
+include::holder/CausewayBlobHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -31,7 +31,7 @@ include::holder/IsisBlobHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisBlobHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayBlobHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -42,16 +42,16 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisBlobHolder_mixinProperty.java[tags=class]
+include::holder/CausewayBlobHolder_mixinProperty.java[tags=class]
 ----
 
 == @PropertyLayout(labelPosition=...)
 
-There is also an extended interface, `IsisBlobHolder2`, with default methods demonstrating the use of label positions:
+There is also an extended interface, `CausewayBlobHolder2`, with default methods demonstrating the use of label positions:
 
 [source,java]
 ----
-include::holder/IsisBlobHolder2.java[tags=class]
+include::holder/CausewayBlobHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-description.adoc
index 126b4dd66d..d35bafbbc9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs-description.adoc
@@ -2,7 +2,7 @@
 
 The framework has built-in support for binary large objects, using the `Blob` data type.
 
-NOTE: This is an Apache Isis specific data type.
+NOTE: This is an Apache Causeway specific data type.
 
 From here you can:
 
@@ -15,17 +15,17 @@ Some properties on these domain objects are mandatory, some optional.
 
 The entity and view model types both implement some common interfaces.
 
-=== IsisBlobHolder
+=== CausewayBlobHolder
 
-The `IsisBlobHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayBlobHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisBlobHolder.java[tags=class]
+include::holder/CausewayBlobHolder.java[tags=class]
 ----
 
-=== IsisBlobHolder2
+=== CausewayBlobHolder2
 
-The `IsisBlobHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayBlobHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/CausewayBlobs.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo-description.adoc
index b5b7767f0c..1d85752cd8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/CausewayBlobJdo-description.adoc
@@ -1,19 +1,19 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Apache Isis implements the relevant JDO extension points to allow the `Blob` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `Blob` type to be persisted.
 To do so correctly, it requires that the column names for the three constituent parts of a `Blob` are specified using `@Column`:
 
 [source,java]
 ----
-include::IsisBlobJdo.java[tags=class]
+include::CausewayBlobJdo.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisBlobs-common.adoc[]
\ No newline at end of file
+include::../CausewayBlobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa-description.adoc
index ff6e3af1b9..59c74967f8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/CausewayBlobJpa-description.adoc
@@ -5,20 +5,20 @@
 TODO this yet is just a copy from JDO
 ====
 
-Apache Isis implements the relevant JDO extension points to allow the `Blob` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `Blob` type to be persisted.
 To do so correctly, it requires that the column names for the three constituent parts of a `Blob` are specified using `@Column`:
 
 [source,java]
 ----
-include::IsisBlobJpa.java[tags=class]
+include::CausewayBlobJpa.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisBlobs-common.adoc[]
\ No newline at end of file
+include::../CausewayBlobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/CausewayBlobEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
index 48da1064d7..e86f4ba4fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/CausewayBlobsSamples.java
@@ -41,7 +41,7 @@ public class CausewayBlobsSamples implements Samples<Blob> {
     private final Can<Blob> blobs = Can.of(
             "file-sample_100kB.docx",
             //"file-sample_150kB.pdf",
-            "isis-logo-568x286.png",
+            "causeway-logo-568x286.png",
             "compressed.tracemonkey-pldi-09.pdf" // advanced example from the Mozilla pdf.js project
             )
         .map(this::loadBlob);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm-description.adoc
index 2fc3a8a676..9bf8be8be8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm-description.adoc
@@ -1,17 +1,17 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The Apache Isis `Blob` value type provides its own implementation of `@XmlJavaTypeAdapter`, meaning that JAXB can serialize the state of this value type without any further annotations required on the view model itself:
+The Apache Causeway `Blob` value type provides its own implementation of `@XmlJavaTypeAdapter`, meaning that JAXB can serialize the state of this value type without any further annotations required on the view model itself:
 
 [source,java]
 ----
-include::IsisBlobVm.java[tags=class]
+include::CausewayBlobVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../IsisBlobs-common.adoc[]
\ No newline at end of file
+include::../CausewayBlobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/CausewayBlobVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-common.adoc
index 035f168200..3e19d546d6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-common.adoc
@@ -2,28 +2,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisClobHolder` interface, demonstrate the use of `Clob` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayClobHolder` interface, demonstrate the use of `Clob` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisClobHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayClobHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisClobHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayClobHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisClobHolder_actionReturning.java[tags=class]
+include::holder/CausewayClobHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -31,7 +31,7 @@ include::holder/IsisClobHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisClobHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayClobHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -42,17 +42,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisClobHolder_mixinProperty.java[tags=class]
+include::holder/CausewayClobHolder_mixinProperty.java[tags=class]
 ----
 
 
 == @PropertyLayout(labelPosition=...)
 
-There is also an extended interface, `IsisClobHolder2`, with default methods demonstrating the use of label positions:
+There is also an extended interface, `CausewayClobHolder2`, with default methods demonstrating the use of label positions:
 
 [source,java]
 ----
-include::holder/IsisClobHolder2.java[tags=class]
+include::holder/CausewayClobHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-description.adoc
index 5eec0f3b10..75faafdf0b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs-description.adoc
@@ -2,7 +2,7 @@
 
 The framework has built-in support for character large objects, using the `Clob` data type .
 
-NOTE: This is an Apache Isis specific data type.
+NOTE: This is an Apache Causeway specific data type.
 
 From here you can:
 
@@ -15,17 +15,17 @@ Some properties on these domain objects are mandatory, some optional.
 
 The entity and view model types both implement some common interfaces.
 
-=== IsisClobHolder
+=== CausewayClobHolder
 
-The `IsisClobHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayClobHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisClobHolder.java[tags=class]
+include::holder/CausewayClobHolder.java[tags=class]
 ----
 
-=== IsisClobHolder2
+=== CausewayClobHolder2
 
-The `IsisClobHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayClobHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/CausewayClobs.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo-description.adoc
index 6db0df130b..eae676c9dc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/CausewayClobJdo-description.adoc
@@ -1,20 +1,20 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Apache Isis implements the relevant JDO extension points to allow the `Clob` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `Clob` type to be persisted.
 To do so correctly, it requires that the column names for the three constituent parts of a `Clob` are specified using `@Column`.
 It's also necessary to specify the `jdbcType` to hold the characters:
 
 [source,java]
 ----
-include::IsisClobJdo.java[tags=class]
+include::CausewayClobJdo.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisClobs-common.adoc[]
\ No newline at end of file
+include::../CausewayClobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa-description.adoc
index c54473ddbb..6c1ebfed13 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/CausewayClobJpa-description.adoc
@@ -5,21 +5,21 @@
 TODO this yet is just a copy from JDO
 ====
 
-Apache Isis implements the relevant JDO extension points to allow the `Clob` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `Clob` type to be persisted.
 To do so correctly, it requires that the column names for the three constituent parts of a `Clob` are specified using `@Column`.
 It's also necessary to specify the `jdbcType` to hold the characters:
 
 [source,java]
 ----
-include::IsisClobJpa.java[tags=class]
+include::CausewayClobJpa.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisClobs-common.adoc[]
\ No newline at end of file
+include::../CausewayClobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/CausewayClobEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm-description.adoc
index bdb364bfe2..e168a8bc7a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm-description.adoc
@@ -4,14 +4,14 @@ JAXB supports `Clob` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisClobVm.java[tags=class]
+include::CausewayClobVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../IsisClobs-common.adoc[]
\ No newline at end of file
+include::../CausewayClobs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/CausewayClobVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-common.adoc
index 8102ef94ee..798c7a6798 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-common.adoc
@@ -2,28 +2,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisLocalResourcePath` interface, demonstrate the use of `LocalResourcePath` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayLocalResourcePath` interface, demonstrate the use of `LocalResourcePath` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder_actionReturning.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -31,7 +31,7 @@ include::holder/IsisLocalResourcePathHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -42,17 +42,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder_mixinProperty.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder_mixinProperty.java[tags=class]
 ----
 
 
 == @PropertyLayout(labelPosition=...)
 
-There is also an extended interface, `IsisLocalResourcePathHolder2`, with default methods demonstrating the use of label positions:
+There is also an extended interface, `CausewayLocalResourcePathHolder2`, with default methods demonstrating the use of label positions:
 
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder2.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-description.adoc
index 5fda95678b..9ef6034010 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths-description.adoc
@@ -1,10 +1,10 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-The framework has built-in support for representing servlets and other resources that exist alongside the Apache Isis runtime, using the `LocalResourcePath` data type .
+The framework has built-in support for representing servlets and other resources that exist alongside the Apache Causeway runtime, using the `LocalResourcePath` data type .
 When an action returns an instance of this type, then this is rendered as a redirect request to the browser to that resource.
 In this way you could for example return a link to a PDF or image (to be rendered by the web browser itself), or provide access to dynamic content by redirecting to a servlet.
 
-NOTE: This is an Apache Isis specific data type.
+NOTE: This is an Apache Causeway specific data type.
 
 From here you can:
 
@@ -17,17 +17,17 @@ Some properties on these domain objects are mandatory, some optional.
 
 The entity and view model types both implement some common interfaces.
 
-=== IsisLocalResourcePathHolder
+=== CausewayLocalResourcePathHolder
 
-The `IsisLocalResourcePathHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayLocalResourcePathHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisLocalResourcePathHolder.java[tags=class]
+include::holder/CausewayLocalResourcePathHolder.java[tags=class]
 ----
 
-=== IsisLocalResourcePathHolder2
+=== CausewayLocalResourcePathHolder2
 
-The `IsisLocalResourcePathHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayLocalResourcePathHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo-description.adoc
index d9429af034..8e89651b52 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/CausewayLocalResourcePathJdo-description.adoc
@@ -1,21 +1,21 @@
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Apache Isis implements the relevant JDO extension points to allow the `LocalResourcePath` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `LocalResourcePath` type to be persisted.
 No special annotations are required, though `@Column` can be used to fine-tune the mapping.
 The most common usage is to indicate whether the column can be null.
 Since the column ultimately maps down to a string, the column's length could also be specified:
 
 [source,java]
 ----
-include::IsisLocalResourcePathJdo.java[tags=class]
+include::CausewayLocalResourcePathJdo.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisLocalResourcePaths-common.adoc[]
\ No newline at end of file
+include::../CausewayLocalResourcePaths-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa-description.adoc
index 86f34c9b55..0e64b709e0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/CausewayLocalResourcePathJpa-description.adoc
@@ -5,22 +5,22 @@
 TODO this yet is just a copy from JDO
 ====
 
-Apache Isis implements the relevant JDO extension points to allow the `LocalResourcePath` type to be persisted.
+Apache Causeway implements the relevant JDO extension points to allow the `LocalResourcePath` type to be persisted.
 No special annotations are required, though `@Column` can be used to fine-tune the mapping.
 The most common usage is to indicate whether the column can be null.
 Since the column ultimately maps down to a string, the column's length could also be specified:
 
 [source,java]
 ----
-include::IsisLocalResourcePathJpa.java[tags=class]
+include::CausewayLocalResourcePathJpa.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisLocalResourcePaths-common.adoc[]
\ No newline at end of file
+include::../CausewayLocalResourcePaths-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/CausewayLocalResourcePathEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm-description.adoc
index 80479a2ae6..3bd76dc804 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm-description.adoc
@@ -4,14 +4,14 @@ JAXB supports `LocalResourcePath` out-of-the-box, so no special annotations are
 
 [source,java]
 ----
-include::IsisLocalResourcePathVm.java[tags=class]
+include::CausewayLocalResourcePathVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../IsisLocalResourcePaths-common.adoc[]
\ No newline at end of file
+include::../CausewayLocalResourcePaths-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/CausewayLocalResourcePathVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-common.adoc
index 27d5bdfecd..94edeb59d3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-common.adoc
@@ -2,28 +2,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisPasswordHolder` interface, demonstrate the use of `Password` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayPasswordHolder` interface, demonstrate the use of `Password` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisPasswordHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayPasswordHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayPasswordHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisPasswordHolder_actionReturning.java[tags=class]
+include::holder/CausewayPasswordHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -31,7 +31,7 @@ include::holder/IsisPasswordHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisPasswordHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayPasswordHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -42,17 +42,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisPasswordHolder_mixinProperty.java[tags=class]
+include::holder/CausewayPasswordHolder_mixinProperty.java[tags=class]
 ----
 
 
 == @PropertyLayout(labelPosition=...)
 
-There is also an extended interface, `IsisPasswordHolder2`, with default methods demonstrating the use of label positions:
+There is also an extended interface, `CausewayPasswordHolder2`, with default methods demonstrating the use of label positions:
 
 [source,java]
 ----
-include::holder/IsisPasswordHolder2.java[tags=class]
+include::holder/CausewayPasswordHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-description.adoc
index 15569c169d..1d852e82e6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords-description.adoc
@@ -2,7 +2,7 @@
 
 The framework has built-in support strings that are automatically masked as passwords, using the `Password` data type.
 
-NOTE: This is an Apache Isis specific data type.
+NOTE: This is an Apache Causeway specific data type.
 
 From here you can:
 
@@ -15,17 +15,17 @@ Some properties on these domain objects are mandatory, some optional.
 
 The entity and view model types both implement some common interfaces.
 
-=== IsisPasswordHolder
+=== CausewayPasswordHolder
 
-The `IsisPasswordHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayPasswordHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisPasswordHolder.java[tags=class]
+include::holder/CausewayPasswordHolder.java[tags=class]
 ----
 
-=== IsisPasswordHolder2
+=== CausewayPasswordHolder2
 
-The `IsisPasswordHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayPasswordHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/CausewayPasswords.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo-description.adoc
index 3d90c502c9..374a3c6313 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/CausewayPasswordJdo-description.adoc
@@ -4,15 +4,15 @@ JDO supports `Password` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisPasswordJdo.java[tags=class]
+include::CausewayPasswordJdo.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisPasswords-common.adoc[]
\ No newline at end of file
+include::../CausewayPasswords-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa-description.adoc
index 3731726daa..279ebac489 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/CausewayPasswordJpa-description.adoc
@@ -9,15 +9,15 @@ JDO supports `Password` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisPasswordJpa.java[tags=class]
+include::CausewayPasswordJpa.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisPasswords-common.adoc[]
\ No newline at end of file
+include::../CausewayPasswords-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/CausewayPasswordEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm-description.adoc
index baed1d954f..3d89d02cf3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm-description.adoc
@@ -4,14 +4,14 @@ JAXB supports `Password` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisPasswordVm.java[tags=class]
+include::CausewayPasswordVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../IsisPasswords-common.adoc[]
\ No newline at end of file
+include::../CausewayPasswords-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/CausewayPasswordVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-common.adoc
index 8f042eeded..de13898fe6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-common.adoc
@@ -4,28 +4,28 @@ WARNING: TODO v2 - was copy pasted from UUID
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisCalendarEventVmHolder` interface, demonstrate the use of `java.util.UUID` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayCalendarEventVmHolder` interface, demonstrate the use of `java.util.UUID` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayCalendarEventHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayCalendarEventHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder_actionReturning.java[tags=class]
+include::holder/CausewayCalendarEventHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -33,7 +33,7 @@ include::holder/IsisCalendarEventHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayCalendarEventHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -44,17 +44,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder_mixinProperty.java[tags=class]
+include::holder/CausewayCalendarEventHolder_mixinProperty.java[tags=class]
 ----
 
 
 == @PropertyLayout(labelPosition=...)
 
-To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `IsisCalendarEventHolder2` interface:
+To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `CausewayCalendarEventHolder2` interface:
 
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder2.java[tags=class]
+include::holder/CausewayCalendarEventHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-description.adoc
index 42cc6404c7..ed19b41222 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents-description.adoc
@@ -15,17 +15,17 @@ Some properties on these domain objects are mandatory, some optional.
 
 The entity and view model types both implement some common interfaces.
 
-=== IsisCalendarEventHolder
+=== CausewayCalendarEventHolder
 
-The `IsisCalendarEventHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayCalendarEventHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisCalendarEventHolder.java[tags=class]
+include::holder/CausewayCalendarEventHolder.java[tags=class]
 ----
 
-=== IsisCalendarEventHolder2
+=== CausewayCalendarEventHolder2
 
-The `IsisCalendarEventHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayCalendarEventHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/CausewayCalendarEvents.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo-description.adoc
index 2cca442f65..3556a6bacc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/CausewayCalendarEventJdo-description.adoc
@@ -4,15 +4,15 @@ WARNING: TODO v2 - was copy pasted from UUID
 
 [source,java]
 ----
-include::IsisCalendarEventJdo.java[tags=class]
+include::CausewayCalendarEventJdo.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisCalendarEvents-common.adoc[]
\ No newline at end of file
+include::../CausewayCalendarEvents-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa-description.adoc
index dfca482c00..7e365a1f99 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/CausewayCalendarEventJpa-description.adoc
@@ -7,15 +7,15 @@ TODO v2 this yet is just a copy from JDO
 
 [source,java]
 ----
-include::IsisCalendarEventJpa.java[tags=class]
+include::CausewayCalendarEventJpa.java[tags=class]
 ----
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../IsisCalendarEvents-common.adoc[]
\ No newline at end of file
+include::../CausewayCalendarEvents-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/CausewayCalendarEventEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm-description.adoc
index 846970c60e..185c8135e2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm-description.adoc
@@ -6,14 +6,14 @@ JAXB supports `CalendarEvent` out-of-the-box, so no special annotations are requ
 
 [source,java]
 ----
-include::IsisCalendarEventVm.java[tags=class]
+include::CausewayCalendarEventVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../IsisCalendarEvents-common.adoc[]
\ No newline at end of file
+include::../CausewayCalendarEvents-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/CausewayCalendarEventVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml
index ab6ed2db7a..99bdeb8cf4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-		xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-		xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-		xmlns:cpt="http://isis.apache.org/applib/layout/component"
+		xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+		xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+		xmlns:cpt="http://causeway.apache.org/applib/layout/component"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<bs3:row>
 		<bs3:col span="12" unreferencedActions="true">
@@ -43,4 +43,4 @@
 		</bs3:col>
 	</bs3:row>
 
-</bs3:grid>
\ No newline at end of file
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
index 658d567b90..2c04054d3d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages-description.adoc
@@ -2,7 +2,7 @@
 
 The framework has built-in support for images, using the `Image` data type.
 
-NOTE: This is an Apache Isis specific data type.
+NOTE: This is an Apache Causeway specific data type.
 
 From here you can:
 
@@ -28,4 +28,4 @@ include::holder/JavaAwtBufferedImageHolder.java[tags=class]
 
 The `JavaAwtBufferedImageHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
 
-Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the entity and view model object pages.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
index 079e460c0f..85766bed96 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaAwtBufferedImageJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
 // not yet supported
-//<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+//<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
index 327964da27..3fcdefd40c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaAwtBufferedImageJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
 // not yet supported
-//<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+//<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml
index 1e56470f4f..2154b239a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/persistence/JavaAwtBufferedImageEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
index a1ca6383c9..9a4906b0fd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm-description.adoc
@@ -9,8 +9,8 @@ include::JavaAwtBufferedImageVm.java[tags=class]
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
 // not yet supported
-// <.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+// <.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml
index 1e56470f4f..2154b239a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.layout.xml
index f47a467809..34dc87d8f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo-description.adoc
index 56d82c2fa1..3959644899 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo-description.adoc
@@ -9,11 +9,11 @@ include::JavaMathBigDecimalJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
 <.> `BigDecimal` with at most 2 digits to the right of the decimal point (`scale=2`)
-<.> optional property as defined to Apache Isis
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaMathBigDecimals-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigDecimals-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa-description.adoc
index f2315f6dfd..3c2b3f0b2d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jpa/JavaMathBigDecimalJpa-description.adoc
@@ -14,11 +14,11 @@ include::JavaMathBigDecimalJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
 <.> `BigDecimal` with at most 2 digits to the right of the decimal point (`scale=2`)
-<.> optional property as defined to Apache Isis
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaMathBigDecimals-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigDecimals-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/JavaMathBigDecimalEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/JavaMathBigDecimalEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/JavaMathBigDecimalEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/persistence/JavaMathBigDecimalEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm-description.adoc
index 1d06e02caf..b9177edab5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm-description.adoc
@@ -8,9 +8,9 @@ include::JavaMathBigDecimalVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
-include::../JavaMathBigDecimals-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigDecimals-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo-description.adoc
index 8ec75f821e..03d2ccf043 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaMathBigIntegerJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaMathBigIntegers-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigIntegers-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa-description.adoc
index ac12cf6893..89d4d360fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jpa/JavaMathBigIntegerJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaMathBigIntegerJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaMathBigIntegers-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigIntegers-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/JavaMathBigIntegerEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/JavaMathBigIntegerEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/JavaMathBigIntegerEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/persistence/JavaMathBigIntegerEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm-description.adoc
index 7d57d89a86..64d853a8ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm-description.adoc
@@ -8,10 +8,10 @@ include::JavaMathBigIntegerVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../JavaMathBigIntegers-common.adoc[]
\ No newline at end of file
+include::../JavaMathBigIntegers-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.layout.xml
index df52c6284a..74b487e5b2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo-description.adoc
index ed683fa8db..a5ed628e9e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaNetUrlJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaNetUrls-common.adoc[]
\ No newline at end of file
+include::../JavaNetUrls-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa-description.adoc
index 83c006e85a..ab37e30713 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jpa/JavaNetUrlJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaNetUrlJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaNetUrls-common.adoc[]
\ No newline at end of file
+include::../JavaNetUrls-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/JavaNetUrlEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/JavaNetUrlEntity.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/JavaNetUrlEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/persistence/JavaNetUrlEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm-description.adoc
index 7b8e8fcf79..74f2ca3f1a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm-description.adoc
@@ -8,10 +8,10 @@ include::JavaNetUrlVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 This is the default for JAXB so no additional annotation required.
 
 
-include::../JavaNetUrls-common.adoc[]
\ No newline at end of file
+include::../JavaNetUrls-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.layout.xml
index fe9ce77481..9db6fc4493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo-description.adoc
index ed9e747ff3..264662e5ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaSqlDateJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaSqlDates-common.adoc[]
\ No newline at end of file
+include::../JavaSqlDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa-description.adoc
index a420dad30e..e9248a5e29 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jpa/JavaSqlDateJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaSqlDateJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaSqlDates-common.adoc[]
\ No newline at end of file
+include::../JavaSqlDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.layout.xml
index 47cef34e10..ef07a7c176 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/persistence/JavaSqlDateEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-		xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+		xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm-description.adoc
index 24469c74d3..ce83e1c439 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaSqlDateVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.sql.Date` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.sql.Date` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaSqlDates-common.adoc[]
\ No newline at end of file
+include::../JavaSqlDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo-description.adoc
index ced0144417..809e052602 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaSqlTimestampJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaSqlTimestamps-common.adoc[]
\ No newline at end of file
+include::../JavaSqlTimestamps-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa-description.adoc
index 169aa07902..785981f906 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jpa/JavaSqlTimestampJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaSqlTimestampJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaSqlTimestamps-common.adoc[]
\ No newline at end of file
+include::../JavaSqlTimestamps-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/persistence/JavaSqlTimestampEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm-description.adoc
index 35463b6f2c..d462f44c61 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaSqlTimestampVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.sql.Timestamp` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.sql.Timestamp` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaSqlTimestamps-common.adoc[]
\ No newline at end of file
+include::../JavaSqlTimestamps-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo-description.adoc
index 8130868151..d234c06789 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaTimeLocalDateJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalDates-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa-description.adoc
index 93434bcb33..eadaf5f933 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jpa/JavaTimeLocalDateJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaTimeLocalDateJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalDates-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/persistence/JavaTimeLocalDateEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/persistence/JavaTimeLocalDateEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/persistence/JavaTimeLocalDateEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/persistence/JavaTimeLocalDateEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm-description.adoc
index ce041d18c3..3ac639db6a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeLocalDateVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.LocalDate` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.LocalDate` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeLocalDates-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo-description.adoc
index 8c4f931b06..cb33788e66 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaTimeLocalDateTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa-description.adoc
index 6c2faf8a21..467a8f1e13 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jpa/JavaTimeLocalDateTimeJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaTimeLocalDateTimeJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/persistence/JavaTimeLocalDateTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/persistence/JavaTimeLocalDateTimeEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/persistence/JavaTimeLocalDateTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/persistence/JavaTimeLocalDateTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm-description.adoc
index 72bf5a2950..bc5c48d836 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeLocalDateTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.LocalDateTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.LocalDateTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeLocalDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/JavaTimeLocalTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/JavaTimeLocalTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/JavaTimeLocalTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/JavaTimeLocalTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo-description.adoc
index 1344abba55..d307c1354d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jdo/JavaTimeLocalTimeJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaTimeLocalTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa-description.adoc
index e709948922..92e7f56e6b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/jpa/JavaTimeLocalTimeJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaTimeLocalTimeJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeLocalTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/persistence/JavaTimeLocalTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/persistence/JavaTimeLocalTimeEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/persistence/JavaTimeLocalTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/persistence/JavaTimeLocalTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm-description.adoc
index 0f066be264..ad3923b891 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeLocalTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlAdapter` instructs JAXB how to marshal the `java.time.LocalTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlAdapter` instructs JAXB how to marshal the `java.time.LocalTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeLocalTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeLocalTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaltime/vm/JavaTimeLocalTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo-description.adoc
index e763756622..5eb8610e88 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaTimeOffsetDateTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeOffsetDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa-description.adoc
index fbb657f673..15938f1372 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jpa/JavaTimeOffsetDateTimeJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaTimeOffsetDateTimeJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeOffsetDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/persistence/JavaTimeOffsetDateTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/persistence/JavaTimeOffsetDateTimeEntity.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/persistence/JavaTimeOffsetDateTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/persistence/JavaTimeOffsetDateTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm-description.adoc
index 0f4779717a..7742027c63 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeOffsetDateTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.OffsetDateTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.OffsetDateTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeOffsetDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.layout.xml
index df52c6284a..74b487e5b2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo-description.adoc
index b431ebef1c..1fce2c1905 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo-description.adoc
@@ -9,10 +9,10 @@ include::JavaTimeOffsetTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeOffsetTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa-description.adoc
index 3f406592fc..00eb43d734 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jpa/JavaTimeOffsetTimeJpa-description.adoc
@@ -14,10 +14,10 @@ include::JavaTimeOffsetTimeJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
-include::../JavaTimeOffsetTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/persistence/JavaTimeOffsetTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/persistence/JavaTimeOffsetTimeEntity.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/persistence/JavaTimeOffsetTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/persistence/JavaTimeOffsetTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm-description.adoc
index 314e3a56d6..2386e93ede 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeOffsetTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.OffsetTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.OffsetTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeOffsetTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeOffsetTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo-description.adoc
index fafce797e4..c02cbae4e2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo-description.adoc
@@ -9,11 +9,11 @@ include::JavaTimeZonedDateTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JavaTimeZonedDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeZonedDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa-description.adoc
index 41c285fafc..82c9e704bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jpa/JavaTimeZonedDateTimeJpa-description.adoc
@@ -14,11 +14,11 @@ include::JavaTimeZonedDateTimeJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JavaTimeZonedDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeZonedDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/persistence/JavaTimeZonedDateTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/persistence/JavaTimeZonedDateTimeEntity.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/persistence/JavaTimeZonedDateTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/persistence/JavaTimeZonedDateTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm-description.adoc
index deb372a8bc..2cf1408308 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaTimeZonedDateTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.ZonedDateTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.time.ZonedDateTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaTimeZonedDateTimes-common.adoc[]
\ No newline at end of file
+include::../JavaTimeZonedDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.layout.xml
index 78b2b973d3..5f49c183f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo-description.adoc
index fb3cad98e1..8890dd6158 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo-description.adoc
@@ -9,11 +9,11 @@ include::JavaUtilDateJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JavaUtilDates-common.adoc[]
\ No newline at end of file
+include::../JavaUtilDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa-description.adoc
index b252295683..6e47ddb324 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jpa/JavaUtilDateJpa-description.adoc
@@ -14,11 +14,11 @@ include::JavaUtilDateJpa.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JavaUtilDates-common.adoc[]
\ No newline at end of file
+include::../JavaUtilDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/persistence/JavaUtilDateEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/persistence/JavaUtilDateEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/persistence/JavaUtilDateEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/persistence/JavaUtilDateEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm-description.adoc
index e0dfbb0647..75fc5af4b3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm-description.adoc
@@ -8,11 +8,11 @@ include::JavaUtilDateVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.util.Date` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `java.util.Date` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JavaUtilDates-common.adoc[]
\ No newline at end of file
+include::../JavaUtilDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.layout.xml
index b20b69a64d..86507c8e4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo-description.adoc
index 3ea4df8dac..683e5e72d9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo-description.adoc
@@ -9,11 +9,11 @@ include::JodaDateTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JodaDateTimes-common.adoc[]
\ No newline at end of file
+include::../JodaDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/persistence/JodaDateTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/persistence/JodaDateTimeEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/persistence/JodaDateTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/persistence/JodaDateTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm-description.adoc
index bd9b9509a3..e46190e156 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm-description.adoc
@@ -8,11 +8,11 @@ include::JodaDateTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `org.joda.time.DateTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `org.joda.time.DateTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
-include::../JodaDateTimes-common.adoc[]
\ No newline at end of file
+include::../JodaDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo-description.adoc
index c767655417..969570998b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo-description.adoc
@@ -9,11 +9,11 @@ include::JodaLocalDateJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
 
-include::../JodaLocalDates-common.adoc[]
\ No newline at end of file
+include::../JodaLocalDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/persistence/JodaLocalDateEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/persistence/JodaLocalDateEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/persistence/JodaLocalDateEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/persistence/JodaLocalDateEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm-description.adoc
index 77b865f496..d0e81c4f80 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm-description.adoc
@@ -8,12 +8,12 @@ include::JodaLocalDateVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `joda.time.LocalDate` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `joda.time.LocalDate` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
 
-include::../JodaLocalDates-common.adoc[]
\ No newline at end of file
+include::../JodaLocalDates-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.layout.xml
index 74e0160a87..4b3d5b3858 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo-description.adoc
index f317cb269f..c2250bfc0f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo-description.adoc
@@ -9,9 +9,9 @@ include::JodaLocalDateTimeJdo.java[tags=class]
 <.> a no-arg constructor is introduced by JDO enhancer
 <.> required property as defined to JDO/DataNucleus.
 +
-Apache Isis assumes properties are mandatory, so no additional annotation is required.
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis
+Apache Causeway assumes properties are mandatory, so no additional annotation is required.
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway
 <.> optional property as defined to JDO/DataNucleus
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/persistence/JodaLocalDateTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/persistence/JodaLocalDateTimeEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/persistence/JodaLocalDateTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/persistence/JodaLocalDateTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm-description.adoc
index 7218c04579..3996b6341a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm-description.adoc
@@ -8,12 +8,12 @@ include::JodaLocalDateTimeVm.java[tags=class]
 ----
 <.> a no-arg constructor is required by JAXB
 <.> required property as defined to JAXB
-<.> The `org.apache.isis.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `joda.time.LocalDateTime` instance to and from XML
-<.> directly editable property as defined to Apache Isis
-<.> optional property as defined to Apache Isis.
+<.> The `org.apache.causeway.applib.util.JaxbAdapters.SqlDateAdapter` instructs JAXB how to marshal the `joda.time.LocalDateTime` instance to and from XML
+<.> directly editable property as defined to Apache Causeway
+<.> optional property as defined to Apache Causeway.
 +
 Properties are optional by default in JAXB, so no additional annotation required.
 
 
 
-include::../JodaLocalDateTimes-common.adoc[]
\ No newline at end of file
+include::../JodaLocalDateTimes-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/persistence/JodaLocalTimeEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/persistence/JodaLocalTimeEntity.layout.xml
index 149a5265fd..a03b2faf53 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/persistence/JodaLocalTimeEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/persistence/JodaLocalTimeEntity.layout.xml
@@ -10,9 +10,9 @@
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
 <bs3:grid
-        xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd   http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
-        xmlns:cpt="http://isis.apache.org/applib/layout/component"
+        xsi:schemaLocation="http://causeway.apache.org/applib/layout/component http://causeway.apache.org/applib/layout/component/component.xsd   http://causeway.apache.org/applib/layout/grid/bootstrap3 http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+        xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:cpt="http://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<bs3:row>
diff --git a/examples/demo/domain/src/main/resources/META-INF/MANIFEST.MF b/examples/demo/domain/src/main/resources/META-INF/MANIFEST.MF
index 16687e1229..6e2753fa57 100644
--- a/examples/demo/domain/src/main/resources/META-INF/MANIFEST.MF
+++ b/examples/demo/domain/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: org.apache.isis.persistence.dn-plugins
-Bundle-SymbolicName: org.apache.isis.persistence.dn-plugins
+Bundle-Name: org.apache.causeway.persistence.dn-plugins
+Bundle-SymbolicName: org.apache.causeway.persistence.dn-plugins
 Bundle-Version: 1.0.0
-Bundle-Vendor: Apache Isis
+Bundle-Vendor: Apache Causeway
diff --git a/examples/demo/domain/src/main/resources/application.yml b/examples/demo/domain/src/main/resources/application.yml
index 679497e67e..58a6f4b1ea 100644
--- a/examples/demo/domain/src/main/resources/application.yml
+++ b/examples/demo/domain/src/main/resources/application.yml
@@ -17,7 +17,7 @@
 #
 # See also config/application.properties
 #
-isis:
+causeway:
 
   applib:
     annotation:
@@ -75,18 +75,18 @@ isis:
         favicon-url: images/gift.svg
         brand-logo-header: images/gift_48.png
         brand-logo-signin: images/gift_256.png
-        name: Apache Isis Demo App
+        name: Apache Causeway Demo App
         # https://stackoverflow.com/a/38983935/56880
         # in addition using special config with the project's maven-resources-plugin
         version: ${project.version}
         css: css/application.css
         js: scripts/application.js
-        about: This application demonstrates many aspects of the Apache Isis programming model, as well as some of the most significant domain services and extensions such as the WrapperFactory, security, commands and publishing.
+        about: This application demonstrates many aspects of the Apache Causeway programming model, as well as some of the most significant domain services and extensions such as the WrapperFactory, security, commands and publishing.
 
       credit:
-        - url:  http://isis.apache.org
-          image: images/apache-isis/logo-48x48.png
-          name: Apache Isis
+        - url:  http://causeway.apache.org
+          image: images/apache-causeway/logo-48x48.png
+          name: Apache Causeway
 
       themes:
         initial: Flatly
@@ -107,7 +107,7 @@ isis:
 # schema auto creation etc. ...
   persistence:
     schema:
-       autoCreateSchemas: isisExtSecman,isisExtCommandLog,isisExtExecutionLog,isisExtExecutionOutbox,isisExtSessionLog,isisExtAuditTrail,demo
+       autoCreateSchemas: causewayExtSecman,causewayExtCommandLog,causewayExtExecutionLog,causewayExtExecutionOutbox,causewayExtSessionLog,causewayExtAuditTrail,demo
 
   extensions:
     secman:
@@ -115,12 +115,12 @@ isis:
         admin:
           user-name: "sven"
           password: "pass"
-          role-name: "isis-ext-secman-admin"
+          role-name: "causeway-ext-secman-admin"
           namespace-permissions:
-            sticky: "isis"
+            sticky: "causeway"
             additional: "demo"
         regular-user:
-          role-name: "isis-ext-secman-user"
+          role-name: "causeway-ext-secman-user"
       permissionsEvaluationPolicy: ALLOW_BEATS_VETO
 
   testing:
diff --git a/examples/demo/domain/src/main/resources/config/application-primary.properties b/examples/demo/domain/src/main/resources/config/application-primary.properties
index 2c3d2b3778..2c5143ab26 100644
--- a/examples/demo/domain/src/main/resources/config/application-primary.properties
+++ b/examples/demo/domain/src/main/resources/config/application-primary.properties
@@ -18,4 +18,4 @@
 #
 
 server.port=8080
-isis.extensions.commandreplay.secondary-access.base-url-wicket=http://localhost:9090/wicket/
+causeway.extensions.commandreplay.secondary-access.base-url-wicket=http://localhost:9090/wicket/
diff --git a/examples/demo/domain/src/main/resources/config/application-secondary.properties b/examples/demo/domain/src/main/resources/config/application-secondary.properties
index 5f6ef71dad..f2cf7e135c 100644
--- a/examples/demo/domain/src/main/resources/config/application-secondary.properties
+++ b/examples/demo/domain/src/main/resources/config/application-secondary.properties
@@ -17,9 +17,9 @@
 #  under the License.
 #
 
-isis.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
-isis.extensions.commandreplay.primary-access.user=sven
-isis.extensions.commandreplay.primary-access.password=pass
-isis.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
+causeway.extensions.commandreplay.primary-access.base-url-restful=http://localhost:8080/restful/
+causeway.extensions.commandreplay.primary-access.user=sven
+causeway.extensions.commandreplay.primary-access.password=pass
+causeway.extensions.commandreplay.primary-access.base-url-wicket=http://localhost:8080/wicket/
 
 server.port=9090
diff --git a/examples/demo/domain/src/main/resources/templates/error.html b/examples/demo/domain/src/main/resources/templates/error.html
index f0131e45b0..26eb8e436d 100644
--- a/examples/demo/domain/src/main/resources/templates/error.html
+++ b/examples/demo/domain/src/main/resources/templates/error.html
@@ -22,13 +22,13 @@
 <html xmlns:th="http://www.thymeleaf.org">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Isis&trade; Demo App</title>
+        <title>Apache Causeway&trade; Demo App</title>
 
         <link rel="stylesheet" type="text/css" th:href="@{/css/page.css}">
     </head>
     <body>
         <div id="wrapper">
-            <img alt="Isis Logo" th:src="@{/images/apache-isis/logo.png}" />
+            <img alt="Causeway Logo" th:src="@{/images/apache-causeway/logo.png}" />
 
             <p>
                 Our apologies - an error occurred.
diff --git a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
index 61c0960038..b79c2fc0b8 100644
--- a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
+++ b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
@@ -49,7 +49,7 @@ public class DemoAppJavaFx {
     @Bean
     public JavaFxViewerConfig viewerConfig() {
         return JavaFxViewerConfig.builder()
-                .applicationTitle("Apache Isis Demo")
+                .applicationTitle("Apache Causeway Demo")
                 .applicationIcon(_fx.imageFromClassPath(DemoAppJavaFx.class, "icon.png"))
                 .brandingIcon(_fx.imageFromClassPath(DemoAppJavaFx.class, "gift_32.png"))
                 .objectFallbackIcon(_fx.imageFromClassPath(DemoAppJavaFx.class, "object_fallback_icon.png"))
diff --git a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
index 4ad6a0a8fd..ee3a7b0e4c 100644
--- a/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
+++ b/examples/demo/javafx/src/test/java/demoapp/javafx/integtest/DemoFxTestAbstract.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
 import org.apache.causeway.incubator.viewer.javafx.model.context.UiContextFx;
 import org.apache.causeway.incubator.viewer.javafx.viewer.CausewayModuleIncViewerJavaFxViewer;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.junit.jupiter.api.BeforeAll;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -39,7 +39,7 @@ import demoapp.dom.DemoModuleJdo;
                 CausewayModuleIncViewerJavaFxViewer.class,
         }
 )
-public abstract class DemoFxTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class DemoFxTestAbstract extends CausewayIntegrationTestAbstract {
 
     @Inject protected UiContextFx uiContext;
 
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 16980b6fc4..7c799ecff5 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -91,10 +91,10 @@
 						<exclude>**/webpack.generated.js</exclude>
 
 						<exclude>**/CREDITS.TXT</exclude>
-						<exclude>**/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/**</exclude>
-						<exclude>**/domain/src/main/java/demoapp/dom/types/isis/markups/samples/**</exclude>
-						<exclude>**/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/**</exclude>
-						<exclude>**/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/**</exclude>
+						<exclude>**/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/**</exclude>
+						<exclude>**/domain/src/main/java/demoapp/dom/types/causeway/markups/samples/**</exclude>
+						<exclude>**/domain/src/main/java/demoapp/dom/types/causewayext/asciidocs/samples/**</exclude>
+						<exclude>**/domain/src/main/java/demoapp/dom/types/causewayext/markdowns/samples/**</exclude>
 						<exclude>**/domain/src/main/resources/banner.txt</exclude>
 						<exclude>**/domain/src/main/resources/static/**</exclude>
 						<exclude>**/domain/src/test/resources/demoapp/dom/_infra/resources/</exclude>
diff --git a/examples/demo/pre-flight.adoc b/examples/demo/pre-flight.adoc
index 037c8b618b..34bdc6aa41 100644
--- a/examples/demo/pre-flight.adoc
+++ b/examples/demo/pre-flight.adoc
@@ -86,14 +86,14 @@ IMPORTANT: renders an empty object (JAXB serialization is not working as expecte
 [IMPORTANT]
 ====
  Caused by: java.util.NoSuchElementException: sources
- 	at org.apache.isis.commons.internal.exceptions._Exceptions.noSuchElement(_Exceptions.java:110) ~[classes/:?]
-	at org.apache.isis.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.lambda$1(PropertyInteractionWkt.java:80) ~[classes/:?]
+ 	at org.apache.causeway.commons.internal.exceptions._Exceptions.noSuchElement(_Exceptions.java:110) ~[classes/:?]
+	at org.apache.causeway.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.lambda$1(PropertyInteractionWkt.java:80) ~[classes/:?]
 	at java.util.Optional.orElseThrow(Optional.java:408) ~[?:?]
-	at org.apache.isis.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.load(PropertyInteractionWkt.java:80) ~[classes/:?]
-	at org.apache.isis.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.load(PropertyInteractionWkt.java:1) ~[classes/:?]
+	at org.apache.causeway.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.load(PropertyInteractionWkt.java:80) ~[classes/:?]
+	at org.apache.causeway.viewer.wicket.model.models.interaction.prop.PropertyInteractionWkt.load(PropertyInteractionWkt.java:1) ~[classes/:?]
 	at org.apache.wicket.model.LoadableDetachableModel.getObject(LoadableDetachableModel.java:128) ~[wicket-core-8.13.0.jar:8.13.0]
 	at org.apache.wicket.model.ChainingModel.getObject(ChainingModel.java:95) ~[wicket-core-8.13.0.jar:8.13.0]
-	at org.apache.isis.viewer.wicket.model.models.interaction.prop.PropertyUiModelWkt.propertyInteraction(PropertyUiModelWkt.java:61) ~[classes/:?]
+	at org.apache.causeway.viewer.wicket.model.models.interaction.prop.PropertyUiModelWkt.propertyInteraction(PropertyUiModelWkt.java:61) ~[classes/:?]
 ==== 
 * [x] Test: remove Child(ren)
 
@@ -207,7 +207,7 @@ _Experimental support for embedded types_
 
 Returns scalar of: `demo.EmbeddedTypeVm`
 
-WARNING: _Work in Progress_ `ISIS-2877` - Support for Value Type Composition
+WARNING: _Work in Progress_ `CAUSEWAY-2877` - Support for Value Type Composition
 
 ===== Collection All Constants
 
@@ -1746,9 +1746,9 @@ Returns scalar of: `demo.WrapperBooleans`
 
 ===== Top-Bar
 
-* [ ] Action `Boolean Boxed Params` _FIXME[ISIS-2387] contrary to the above, second parameter works; however, first parameter is however, first parameter is initialized to null but not rendered as 3-state.  Either we fix rendering or we initialize with FALSE when null_
+* [ ] Action `Boolean Boxed Params` _FIXME[CAUSEWAY-2387] contrary to the above, second parameter works; however, first parameter is however, first parameter is initialized to null but not rendered as 3-state.  Either we fix rendering or we initialize with FALSE when null_
 
-* [ ] Action `Boolean Params` _FIXME[ISIS-2387] even though primitive1 gets initialized with true, the model thinks its null_
+* [ ] Action `Boolean Params` _FIXME[CAUSEWAY-2387] even though primitive1 gets initialized with true, the model thinks its null_
 
 ===== FieldSet 
 
@@ -2136,11 +2136,11 @@ Returns scalar of: `demo.JavaUtilUuids`
 
 * [ ] Property `Description` 
 
-=== Apache Isis Core
+=== Apache Causeway Core
 
 ==== Blobs
 
-Returns scalar of: `demo.IsisBlobs`
+Returns scalar of: `demo.CausewayBlobs`
 
 ===== FieldSet 
 
@@ -2158,7 +2158,7 @@ Returns scalar of: `demo.IsisBlobs`
 
 ==== Clobs
 
-Returns scalar of: `demo.IsisClobs`
+Returns scalar of: `demo.CausewayClobs`
 
 ===== FieldSet 
 
@@ -2176,7 +2176,7 @@ Returns scalar of: `demo.IsisClobs`
 
 ==== Local Resource Paths
 
-Returns scalar of: `demo.IsisLocalResourcePaths`
+Returns scalar of: `demo.CausewayLocalResourcePaths`
 
 ===== FieldSet 
 
@@ -2194,7 +2194,7 @@ Returns scalar of: `demo.IsisLocalResourcePaths`
 
 ==== Markups
 
-Returns scalar of: `demo.IsisMarkups`
+Returns scalar of: `demo.CausewayMarkups`
 
 ===== FieldSet 
 
@@ -2212,7 +2212,7 @@ Returns scalar of: `demo.IsisMarkups`
 
 ==== Passwords
 
-Returns scalar of: `demo.IsisPasswords`
+Returns scalar of: `demo.CausewayPasswords`
 
 ===== FieldSet 
 
@@ -2228,11 +2228,11 @@ Returns scalar of: `demo.IsisPasswords`
 
 * [ ] Property `Description` 
 
-=== Apache Isis Extensions
+=== Apache Causeway Extensions
 
 ==== Ascii Docs
 
-Returns scalar of: `demo.IsisAsciiDocs`
+Returns scalar of: `demo.CausewayAsciiDocs`
 
 ===== FieldSet 
 
@@ -2250,7 +2250,7 @@ Returns scalar of: `demo.IsisAsciiDocs`
 
 ==== Markdowns
 
-Returns scalar of: `demo.IsisMarkdowns`
+Returns scalar of: `demo.CausewayMarkdowns`
 
 ===== FieldSet 
 
@@ -2268,7 +2268,7 @@ Returns scalar of: `demo.IsisMarkdowns`
 
 ==== Calendar Events
 
-Returns scalar of: `demo.IsisCalendarEvents`
+Returns scalar of: `demo.CausewayCalendarEvents`
 
 ===== FieldSet 
 
@@ -2600,7 +2600,7 @@ Returns scalar of: `demo.CustomUiVm`
 
 ==== User Manager
 
-Returns scalar of: `isis.ext.secman.ApplicationUserManager`
+Returns scalar of: `causeway.ext.secman.ApplicationUserManager`
 
 ===== Collection All Users
 
@@ -2614,7 +2614,7 @@ Returns scalar of: `isis.ext.secman.ApplicationUserManager`
 
 ==== Find Users
 
-Returns collection of: `isis.ext.secman.ApplicationUser`
+Returns collection of: `causeway.ext.secman.ApplicationUser`
 
 ===== Top-Bar
 
@@ -2672,7 +2672,7 @@ Returns collection of: `isis.ext.secman.ApplicationUser`
 
 ==== Find Roles
 
-Returns collection of: `isis.ext.secman.ApplicationRole`
+Returns collection of: `causeway.ext.secman.ApplicationRole`
 
 ===== FieldSet Identity
 
@@ -2696,7 +2696,7 @@ Returns collection of: `isis.ext.secman.ApplicationRole`
 
 ==== New Role
 
-Returns scalar of: `isis.ext.secman.ApplicationRole`
+Returns scalar of: `causeway.ext.secman.ApplicationRole`
 
 ===== FieldSet Identity
 
@@ -2720,7 +2720,7 @@ Returns scalar of: `isis.ext.secman.ApplicationRole`
 
 ==== All Roles
 
-Returns collection of: `isis.ext.secman.ApplicationRole`
+Returns collection of: `causeway.ext.secman.ApplicationRole`
 
 ===== FieldSet Identity
 
@@ -2746,7 +2746,7 @@ Returns collection of: `isis.ext.secman.ApplicationRole`
 
 ==== Find Orphaned Permissions
 
-Returns scalar of: `isis.ext.secman.ApplicationOrphanedPermissionManager`
+Returns scalar of: `causeway.ext.secman.ApplicationOrphanedPermissionManager`
 
 ===== Collection Orphaned Permissions
 
@@ -2762,7 +2762,7 @@ Returns scalar of: `isis.ext.secman.ApplicationOrphanedPermissionManager`
 
 ==== Find Tenancies
 
-Returns collection of: `isis.ext.secman.ApplicationTenancy`
+Returns collection of: `causeway.ext.secman.ApplicationTenancy`
 
 ===== FieldSet Identity
 
@@ -2788,7 +2788,7 @@ Returns collection of: `isis.ext.secman.ApplicationTenancy`
 
 ==== New Tenancy
 
-Returns scalar of: `isis.ext.secman.ApplicationTenancy`
+Returns scalar of: `causeway.ext.secman.ApplicationTenancy`
 
 ===== FieldSet Identity
 
@@ -2828,7 +2828,7 @@ Returns scalar of: `isis.ext.secman.ApplicationTenancy`
 
 ==== Configuration
 
-Returns scalar of: `isis.conf.ConfigurationViewmodel`
+Returns scalar of: `causeway.conf.ConfigurationViewmodel`
 
 ===== Collection Configuration
 
@@ -2850,7 +2850,7 @@ Returns scalar of: `isis.conf.ConfigurationViewmodel`
 
 _Looks up ApplicationUser entity corresponding to your user account_
 
-Returns scalar of: `isis.ext.secman.ApplicationUser`
+Returns scalar of: `causeway.ext.secman.ApplicationUser`
 
 ===== Top-Bar
 
@@ -2908,7 +2908,7 @@ Returns scalar of: `isis.ext.secman.ApplicationUser`
 
 _Returns your user account details_
 
-Returns scalar of: `isis.applib.UserMemento`
+Returns scalar of: `causeway.applib.UserMemento`
 
 ===== FieldSet Identity
 
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index 6b39d65637..48e0b74918 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -193,7 +193,7 @@
 								</ports>
 							</container>
 							<to>
-								<image>docker.io/apacheisis/demo-vaadin</image>
+								<image>docker.io/apachecauseway/demo-vaadin</image>
 								<tags>
 									<tag>nightly</tag>
 								</tags>
@@ -212,4 +212,4 @@
 
 	</profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index bf1199d49f..2a9fb5359d 100644
--- a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++ b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -60,10 +60,10 @@ public class DemoAppVaadin extends SpringBootServletInitializer {
      */
     public static void main(final String[] args) {
 
-//        IsisPresets.logging(InteractionServiceDefault.class, "debug");
-//        IsisPresets.logging(VaadinAuthenticationHandler.class, "debug");
-//        IsisPresets.logging(IsisServletForVaadin.class, "debug");
-//        IsisPresets.logging(_Probe.class, "debug"); // enable debug entry logging
+//        CausewayPresets.logging(InteractionServiceDefault.class, "debug");
+//        CausewayPresets.logging(VaadinAuthenticationHandler.class, "debug");
+//        CausewayPresets.logging(CausewayServletForVaadin.class, "debug");
+//        CausewayPresets.logging(_Probe.class, "debug"); // enable debug entry logging
 
         System.setProperty("spring.profiles.active", "demo-jdo");
 
diff --git a/examples/demo/wicket/common/src/main/resources/static/index.html b/examples/demo/wicket/common/src/main/resources/static/index.html
index d09f9c7532..4657c41480 100644
--- a/examples/demo/wicket/common/src/main/resources/static/index.html
+++ b/examples/demo/wicket/common/src/main/resources/static/index.html
@@ -22,16 +22,16 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Isis&trade; Demo App</title>
+        <title>Apache Causeway&trade; Demo App</title>
 
         <link rel="stylesheet" type="text/css" href="css/page.css">
     </head>
     <body>
         <div id="wrapper">
-            <img alt="Isis Logo" src="images/apache-isis/logo.png" />
+            <img alt="Causeway Logo" src="images/apache-causeway/logo.png" />
 
             <p>
-                This demo app illustrates some features of the Apache Isis' programming model.
+                This demo app illustrates some features of the Apache Causeway' programming model.
                 <br/>
             </p>
 
@@ -42,8 +42,8 @@
                         <b><a href="wicket/">Generic UI (Wicket)</a></b>
                     </p>
                     <p>
-                        provides access to a generic UI for end-users, Apache Isis'
-                        <a href="http://isis.apache.org/guides/ugvw/ugvw.html" target="_blank">Wicket Viewer</a>.
+                        provides access to a generic UI for end-users, Apache Causeway'
+                        <a href="http://causeway.apache.org/guides/ugvw/ugvw.html" target="_blank">Wicket Viewer</a>.
                         As its name suggests, this viewer is built on top of
                         <a href="http://wicket.apache.org" target="_blank">Apache Wicket</a>&trade;.
                     </p>
@@ -57,7 +57,7 @@
                     <p>
                         provides access to a Swagger UI for convenient access to a subset of the framework's RESTful
                         API, automatically generated by the
-                        <a href="http://isis.apache.org/guides/ugvro/ugvro.html"
+                        <a href="http://causeway.apache.org/guides/ugvro/ugvro.html"
                            target="_blank">Restful Objects viewer</a>.
                     </p>
                     <p>
@@ -72,10 +72,10 @@
                     </p>
                     <p>
                         provides access to a generic UI client for end-users, leveraging the REST API provided by the
-                        <a href="http://isis.apache.org/guides/ugvro/ugvro.html" target="_blank">Restful Objects viewer</a>.
+                        <a href="http://causeway.apache.org/guides/ugvro/ugvro.html" target="_blank">Restful Objects viewer</a>.
                         This viewer is written in Kotlin/JS and built on top of
                         <a href="https://kvision.gitbook.io/kvision-guide/" target="_blank">KVision</a>&trade;.
-                        This viewer is still in the Apache Isis Incubator - use at your own risk and please report bugs.
+                        This viewer is still in the Apache Causeway Incubator - use at your own risk and please report bugs.
                     </p>
                 </li>
                 <li>
@@ -86,7 +86,7 @@
                     </p>
                     <p>
                         provides a console to access the GraphQL viewer.
-                        This viewer is still in the Apache Isis Incubator - use at your own risk and please report bugs.
+                        This viewer is still in the Apache Causeway Incubator - use at your own risk and please report bugs.
                     </p>
                 </li>
             </ul>
diff --git a/examples/demo/wicket/jdo/pom.xml b/examples/demo/wicket/jdo/pom.xml
index 408d204ccd..c0673f473f 100644
--- a/examples/demo/wicket/jdo/pom.xml
+++ b/examples/demo/wicket/jdo/pom.xml
@@ -130,7 +130,7 @@
 								</ports>
 							</container>
 							<to>
-								<image>docker.io/apacheisis/demo-wicket-jdo</image>
+								<image>docker.io/apachecauseway/demo-wicket-jdo</image>
 								<tags>
 									<tag>${env.REVISION}</tag>
 								</tags>
diff --git a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index b3413b0f2c..355df4338f 100644
--- a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++ b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -90,7 +90,7 @@ public class DemoAppWicketJdo extends SpringBootServletInitializer {
         _OsUtil.thereCanBeOnlyOne();
 
     	CausewayPresets.prototyping();
-        //IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
+        //CausewayPresets.logging(WebRequestCycleForCauseway.class, "debug");
 
         SpringProfileUtil.removeActiveProfile("demo-jpa"); // just in case
         SpringProfileUtil.addActiveProfile("demo-jdo");
diff --git a/examples/demo/wicket/jdo/src/main/resources/log4j2-spring.xml b/examples/demo/wicket/jdo/src/main/resources/log4j2-spring.xml
index 4cdedf1dc7..e2e9c9e350 100644
--- a/examples/demo/wicket/jdo/src/main/resources/log4j2-spring.xml
+++ b/examples/demo/wicket/jdo/src/main/resources/log4j2-spring.xml
@@ -55,8 +55,8 @@ under the License.
 
 
 		<!-- debugging -->
-		<Logger name="org.apache.isis.applib.services.command.CommandServiceDefault" level="warn" />
-		<Logger name="org.apache.isis.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
+		<Logger name="org.apache.causeway.applib.services.command.CommandServiceDefault" level="warn" />
+		<Logger name="org.apache.causeway.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
 
 		<Root level="info">
 			<AppenderRef ref="Console" />
diff --git a/examples/demo/wicket/jdo/src/test/e2e/cypress/integration/login.ts b/examples/demo/wicket/jdo/src/test/e2e/cypress/integration/login.ts
index 281161911e..464808e4a3 100644
--- a/examples/demo/wicket/jdo/src/test/e2e/cypress/integration/login.ts
+++ b/examples/demo/wicket/jdo/src/test/e2e/cypress/integration/login.ts
@@ -21,11 +21,11 @@ describe('login to demo application', () => {
 
     it('login', () => {
         cy.visit('/wicket/');
-        cy.get('.isis-username')
+        cy.get('.causeway-username')
             .type('sven')
             // @ts-ignore
             .tab();
-        cy.get('.isis-password')
+        cy.get('.causeway-password')
             .type('pass')
             .type('{enter}');
 
diff --git a/examples/demo/wicket/jpa-and-graphql/pom.xml b/examples/demo/wicket/jpa-and-graphql/pom.xml
index 5c05d68774..68acff1517 100644
--- a/examples/demo/wicket/jpa-and-graphql/pom.xml
+++ b/examples/demo/wicket/jpa-and-graphql/pom.xml
@@ -134,7 +134,7 @@
 								</ports>
 							</container>
 							<to>
-								<image>docker.io/apacheisis/demo-wicket-jpa-and-graphql</image>
+								<image>docker.io/apachecauseway/demo-wicket-jpa-and-graphql</image>
 								<tags>
 									<tag>${env.REVISION}</tag>
 								</tags>
diff --git a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index b67c9dbdac..14332fc9af 100644
--- a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -94,10 +94,10 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
         _OsUtil.thereCanBeOnlyOne();
 
     	CausewayPresets.prototyping();
-        //IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
-        //IsisPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
-        //IsisPresets.logging(EntityModel.class, "debug");
-        //IsisPresets.logging(FormExecutorDefault.class, "debug");
+        //CausewayPresets.logging(WebRequestCycleForCauseway.class, "debug");
+        //CausewayPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
+        //CausewayPresets.logging(EntityModel.class, "debug");
+        //CausewayPresets.logging(FormExecutorDefault.class, "debug");
 
         SpringProfileUtil.removeActiveProfile("demo-jdo"); // just in case
     	SpringProfileUtil.addActiveProfile("demo-jpa");
diff --git a/examples/demo/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml b/examples/demo/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml
index 4cdedf1dc7..e2e9c9e350 100644
--- a/examples/demo/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml
+++ b/examples/demo/wicket/jpa-and-graphql/src/resources/log4j2-spring.xml
@@ -55,8 +55,8 @@ under the License.
 
 
 		<!-- debugging -->
-		<Logger name="org.apache.isis.applib.services.command.CommandServiceDefault" level="warn" />
-		<Logger name="org.apache.isis.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
+		<Logger name="org.apache.causeway.applib.services.command.CommandServiceDefault" level="warn" />
+		<Logger name="org.apache.causeway.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
 
 		<Root level="info">
 			<AppenderRef ref="Console" />
diff --git a/examples/demo/wicket/jpa/pom.xml b/examples/demo/wicket/jpa/pom.xml
index 56497776cd..263fcfcce2 100644
--- a/examples/demo/wicket/jpa/pom.xml
+++ b/examples/demo/wicket/jpa/pom.xml
@@ -128,7 +128,7 @@
 								</ports>
 							</container>
 							<to>
-								<image>docker.io/apacheisis/demo-wicket-jpa</image>
+								<image>docker.io/apachecauseway/demo-wicket-jpa</image>
 								<tags>
 									<tag>${env.REVISION}</tag>
 								</tags>
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index c5e7f054f7..17bf347c5b 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -91,10 +91,10 @@ public class DemoAppWicketJpa extends SpringBootServletInitializer {
         _OsUtil.thereCanBeOnlyOne();
 
     	CausewayPresets.prototyping();
-        //IsisPresets.logging(WebRequestCycleForIsis.class, "debug");
-        //IsisPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
-        //IsisPresets.logging(EntityModel.class, "debug");
-        //IsisPresets.logging(FormExecutorDefault.class, "debug");
+        //CausewayPresets.logging(WebRequestCycleForCauseway.class, "debug");
+        //CausewayPresets.logging(ComponentFactoryRegistryDefault.class, "debug");
+        //CausewayPresets.logging(EntityModel.class, "debug");
+        //CausewayPresets.logging(FormExecutorDefault.class, "debug");
     	//System.setProperty("spring.jpa.show-sql", "true");
 
         SpringProfileUtil.removeActiveProfile("demo-jdo"); // just in case
diff --git a/examples/demo/wicket/jpa/src/resources/log4j2-spring.xml b/examples/demo/wicket/jpa/src/resources/log4j2-spring.xml
index 4cdedf1dc7..e2e9c9e350 100644
--- a/examples/demo/wicket/jpa/src/resources/log4j2-spring.xml
+++ b/examples/demo/wicket/jpa/src/resources/log4j2-spring.xml
@@ -55,8 +55,8 @@ under the License.
 
 
 		<!-- debugging -->
-		<Logger name="org.apache.isis.applib.services.command.CommandServiceDefault" level="warn" />
-		<Logger name="org.apache.isis.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
+		<Logger name="org.apache.causeway.applib.services.command.CommandServiceDefault" level="warn" />
+		<Logger name="org.apache.causeway.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands" level="debug" />
 
 		<Root level="info">
 			<AppenderRef ref="Console" />
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 24fd0c3dd8..e4320bb890 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
@@ -47,7 +47,7 @@ import org.apache.causeway.extensions.commandlog.applib.integtest.model.Counter_
 import org.apache.causeway.schema.cmd.v2.ActionDto;
 import org.apache.causeway.schema.cmd.v2.CommandDto;
 import org.apache.causeway.schema.cmd.v2.PropertyDto;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -57,7 +57,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import lombok.val;
 
-public abstract class CommandLog_IntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class CommandLog_IntegTestAbstract extends CausewayIntegrationTestAbstract {
 
 
     @BeforeAll
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 a7ee6bc825..ed4ca70f00 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
@@ -52,11 +52,11 @@ import org.apache.causeway.extensions.executionlog.applib.integtest.model.Counte
 import org.apache.causeway.schema.ixn.v2.ActionInvocationDto;
 import org.apache.causeway.schema.ixn.v2.InteractionDto;
 import org.apache.causeway.schema.ixn.v2.PropertyEditDto;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
-public abstract class ExecutionLog_IntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class ExecutionLog_IntegTestAbstract extends CausewayIntegrationTestAbstract {
 
     @BeforeAll
     static void beforeAll() {
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 6636e45978..dbe7508298 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
@@ -50,11 +50,11 @@ import org.apache.causeway.extensions.executionoutbox.applib.integtest.model.Cou
 import org.apache.causeway.schema.ixn.v2.ActionInvocationDto;
 import org.apache.causeway.schema.ixn.v2.InteractionDto;
 import org.apache.causeway.schema.ixn.v2.PropertyEditDto;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
-public abstract class ExecutionOutbox_IntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class ExecutionOutbox_IntegTestAbstract extends CausewayIntegrationTestAbstract {
 
 
     @BeforeAll
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 c30b317de9..977dd9a0bb 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
@@ -32,7 +32,7 @@ import org.apache.causeway.extensions.audittrail.applib.dom.AuditTrailEntryRepos
 import org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter;
 import org.apache.causeway.extensions.audittrail.applib.integtests.model.CounterRepository;
 import org.apache.causeway.extensions.audittrail.applib.integtests.model.Counter_bumpUsingMixin;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import lombok.val;
 
-public abstract class AuditTrail_IntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class AuditTrail_IntegTestAbstract extends CausewayIntegrationTestAbstract {
 
     @BeforeAll
     static void beforeAll() {
diff --git a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
index 3fb8385cc1..c6e4506b3d 100644
--- a/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
+++ b/extensions/security/secman/applib/src/test/java/org/apache/causeway/extensions/secman/applib/ApplicationPermissionRepositoryIntegTestAbstract.java
@@ -37,7 +37,7 @@ import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;
 import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserRepository;
 import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUserStatus;
 
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import static org.apache.causeway.applib.services.appfeat.ApplicationFeatureId.newType;
 import static org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionMode.CHANGING;
@@ -45,7 +45,7 @@ import static org.apache.causeway.extensions.secman.applib.permission.dom.Applic
 
 import lombok.val;
 
-public abstract class ApplicationPermissionRepositoryIntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class ApplicationPermissionRepositoryIntegTestAbstract extends CausewayIntegrationTestAbstract {
 
     protected ApplicationUser maryUser, mungoUser, midgeUser;
     protected ApplicationRole girlRole, dogRole, mouseRole, littleRole, flatDwellerRole;
diff --git a/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java b/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
index fe5739609d..ea39ab0ada 100644
--- a/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
+++ b/extensions/security/sessionlog/applib/src/test/java/org/apache/causeway/extensions/sessionlog/applib/integtests/SessionLogIntegTestAbstract.java
@@ -39,12 +39,12 @@ import org.apache.causeway.applib.services.session.SessionSubscriber;
 import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntry;
 import org.apache.causeway.extensions.sessionlog.applib.dom.SessionLogEntryRepository;
 
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-public abstract class SessionLogIntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class SessionLogIntegTestAbstract extends CausewayIntegrationTestAbstract {
 
 
     @Value
diff --git a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
index c74bd3f4fc..be13878e87 100644
--- a/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/causeway/testdomain/wrapper/WrapperAsyncTest.java
@@ -50,7 +50,7 @@ import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
 import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
 import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import static org.apache.causeway.applib.services.wrapper.control.AsyncControl.returning;
 
@@ -65,7 +65,7 @@ import lombok.val;
 )
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
 @DirtiesContext // because of the temporary installed ActionDomainEventListener
-class WrapperAsyncTest extends IsisIntegrationTestAbstract {
+class WrapperAsyncTest extends CausewayIntegrationTestAbstract {
 
 //    @Inject private FixtureScripts fixtureScripts;
     @Inject private RepositoryService repository;
diff --git a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
index 8be5e90666..a2c897149a 100644
--- a/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
+++ b/regressiontests/stable-cmdexecauditsess/generic/src/main/java/org/apache/causeway/regressiontests/cmdexecauditsess/generic/integtest/CmdExecAuditSessLog_IntegTestAbstract.java
@@ -55,11 +55,11 @@ import org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.mo
 import org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.Counter_bumpUsingMixin;
 import org.apache.causeway.schema.cmd.v2.ActionDto;
 import org.apache.causeway.schema.ixn.v2.ActionInvocationDto;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
-public abstract class CmdExecAuditSessLog_IntegTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class CmdExecAuditSessLog_IntegTestAbstract extends CausewayIntegrationTestAbstract {
 
     @BeforeAll
     static void beforeAll() {
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
index 1b36fcfe0e..692897f2ff 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/DomainModelTest_forEditing.java
@@ -38,7 +38,7 @@ import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
 import org.apache.causeway.core.metamodel.specloader.specimpl.IntrospectionState;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -58,7 +58,7 @@ import lombok.val;
     CausewayPresets.SilenceMetaModel,
     CausewayPresets.SilenceProgrammingModel
 })
-class DomainModelTest_forEditing extends IsisIntegrationTestAbstract {
+class DomainModelTest_forEditing extends CausewayIntegrationTestAbstract {
 
     @Inject private WrapperFactory wrapper;
     @Inject private SpecificationLoader specificationLoader;
diff --git a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
index 0b79125b91..7b6b6cf959 100644
--- a/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
+++ b/regressiontests/stable-factory/src/test/java/org/apache/causeway/testdomain/factory/ViewModelFactoryTest.java
@@ -32,7 +32,7 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -44,7 +44,7 @@ import lombok.val;
         }
 )
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
-class ViewModelFactoryTest extends IsisIntegrationTestAbstract {
+class ViewModelFactoryTest extends CausewayIntegrationTestAbstract {
 
     // -- VIEW MODEL SAMPLES
     
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
index fd51bc1cf8..5bd09081ef 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextTest.java
@@ -36,7 +36,7 @@ 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;
 import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
 
 import lombok.val;
@@ -52,7 +52,7 @@ import lombok.val;
     CausewayPresets.SilenceMetaModel,
     CausewayPresets.SilenceProgrammingModel
 })
-class CustomContextTest extends IsisIntegrationTestAbstract {
+class CustomContextTest extends CausewayIntegrationTestAbstract {
 
     @Inject InteractionService interactionService;
 
diff --git a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
index ad72a6d32b..391f19a8a8 100644
--- a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
+++ b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
@@ -73,7 +73,7 @@ import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
 import org.apache.causeway.schema.metamodel.v2.FacetAttr;
 import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
 
 import lombok.val;
@@ -82,7 +82,7 @@ import lombok.val;
         classes = Layout_Counter_IntegTest.AppManifest.class
 )
 @ActiveProfiles("test")
-public class Layout_Counter_IntegTest extends IsisIntegrationTestAbstract {
+public class Layout_Counter_IntegTest extends CausewayIntegrationTestAbstract {
 
     @SpringBootConfiguration
     @EnableAutoConfiguration
diff --git a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
index 7500cc9c1d..037b453c5c 100644
--- a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
+++ b/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
@@ -64,7 +64,7 @@ import org.apache.causeway.schema.metamodel.v2.DomainClassDto;
 import org.apache.causeway.schema.metamodel.v2.FacetAttr;
 import org.apache.causeway.schema.metamodel.v2.MetamodelDto;
 import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.viewer.wicket.applib.CausewayModuleViewerWicketApplibMixins;
 
 import lombok.val;
@@ -73,7 +73,7 @@ import lombok.val;
         classes = Layout_SimpleObject_IntegTest.AppManifest.class
 )
 @ActiveProfiles("test")
-public class Layout_SimpleObject_IntegTest extends IsisIntegrationTestAbstract {
+public class Layout_SimpleObject_IntegTest extends CausewayIntegrationTestAbstract {
 
     @SpringBootConfiguration
     @EnableAutoConfiguration
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
index 21ae474b7d..b13dc20123 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/injecting/jdo/JdoEntityInjectingTest.java
@@ -43,7 +43,7 @@ import org.apache.causeway.testdomain.jdo.entities.JdoBook;
 import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
 import org.apache.causeway.testdomain.util.dto.BookDto;
 import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
@@ -61,7 +61,7 @@ import lombok.extern.log4j.Log4j2;
 @Transactional
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Log4j2
-class JdoEntityInjectingTest extends IsisIntegrationTestAbstract {
+class JdoEntityInjectingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private JdoTestFixtures jdoTestFixtures;
     @Inject private RepositoryService repository;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
index 7374018989..6fc567829b 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoBootstrappingTest.java
@@ -40,7 +40,7 @@ import org.apache.causeway.core.config.presets.CausewayPresets;
 import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
 import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
 import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -51,7 +51,7 @@ import lombok.val;
 )
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
 @Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class JdoBootstrappingTest extends IsisIntegrationTestAbstract {
+class JdoBootstrappingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private JdoTestFixtures testFixtures;
 
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
index 4b8d69888d..53c4844830 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/persistence/jdo/JdoQueryTest.java
@@ -42,7 +42,7 @@ import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
 import org.apache.causeway.testdomain.jdo.entities.JdoBook;
 import org.apache.causeway.testdomain.jdo.entities.JdoInventory;
 import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -53,7 +53,7 @@ import lombok.val;
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional
-class JdoQueryTest extends IsisIntegrationTestAbstract {
+class JdoQueryTest extends CausewayIntegrationTestAbstract {
 
  //   @Inject private JdoSupportService jdoSupport;
     @Inject private JdoTestFixtures jdoTestFixtures;
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
index 8c214b6942..5bda7ccdda 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/timestamping/jdo/JdoTimestampingTest.java
@@ -28,7 +28,7 @@ import org.apache.causeway.applib.services.repository.RepositoryService;
 import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
 import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
 import org.apache.causeway.testdomain.jdo.entities.JdoProductComment;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -43,7 +43,7 @@ import lombok.val;
                 "logging.level.org.apache.causeway.persistence.jdo.datanucleus.changetracking.JdoLifecycleListener = DEBUG"
         })
 @Transactional
-class JdoTimestampingTest extends IsisIntegrationTestAbstract {
+class JdoTimestampingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private RepositoryService repository;
 
diff --git a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
index 175e48d1e9..07f745710a 100644
--- a/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
+++ b/regressiontests/stable-persistence-jdo/src/test/java/org/apache/causeway/testdomain/wrapper/jdo/JdoWrapperSyncTest.java
@@ -36,7 +36,7 @@ import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
 import org.apache.causeway.testdomain.jdo.JdoInventoryManager;
 import org.apache.causeway.testdomain.jdo.entities.JdoBook;
 import org.apache.causeway.testdomain.jdo.entities.JdoProduct;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -46,7 +46,7 @@ import lombok.val;
         }
 )
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
-class JdoWrapperSyncTest extends IsisIntegrationTestAbstract {
+class JdoWrapperSyncTest extends CausewayIntegrationTestAbstract {
 
     @Inject private RepositoryService repository;
     @Inject private FactoryService facoryService;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
index cb43191f33..1e92813b1b 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
@@ -44,7 +44,7 @@ import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
 import org.apache.causeway.testdomain.util.dto.BookDto;
 import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
@@ -61,7 +61,7 @@ import lombok.extern.log4j.Log4j2;
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Log4j2
 @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
-class JpaEntityInjectingTest extends IsisIntegrationTestAbstract {
+class JpaEntityInjectingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private JpaTestFixtures jpaTestFixtures;
     @Inject private RepositoryService repository;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
index 4aedaad334..c74eb1c020 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaBootstrappingTest.java
@@ -48,7 +48,7 @@ import org.apache.causeway.testdomain.jdo.JdoTestFixtures;
 import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
 import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
 import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -59,7 +59,7 @@ import lombok.val;
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
 @Transactional @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 // @DirtiesContext // doesn't seem to tidy up correctly ... I see InteractionService still injected into entities in the _next_ tests run (JpaExceptionTranslationTest_usingTransactional)
-class JpaBootstrappingTest extends IsisIntegrationTestAbstract {
+class JpaBootstrappingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private Optional<PlatformTransactionManager> platformTransactionManager;
     @Inject private SpecificationLoader specLoader;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
index 91d8b5b577..38772aa034 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/JpaQueryTest.java
@@ -46,7 +46,7 @@ import org.apache.causeway.testdomain.jpa.JpaTestFixtures;
 import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testdomain.jpa.entities.JpaInventory;
 import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -58,7 +58,7 @@ import lombok.val;
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional
-class JpaQueryTest extends IsisIntegrationTestAbstract {
+class JpaQueryTest extends CausewayIntegrationTestAbstract {
 
     @Inject private JpaTestFixtures testFixtures;
     @Inject private InteractionService interactionService;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
index 0da30a8ce9..72ef0d8d3f 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/persistence/jpa/springdata/SpringDataJpaBootstrappingTest.java
@@ -49,7 +49,7 @@ import org.apache.causeway.testdomain.jpa.springdata.EmployeeRepository;
 import org.apache.causeway.testdomain.jpa.springdata.SpringDataJpaTestModule;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import lombok.val;
 
@@ -63,7 +63,7 @@ import lombok.val;
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DirtiesContext
 // @Disabled // ISIS-2789 revert
-class SpringDataJpaBootstrappingTest extends IsisIntegrationTestAbstract {
+class SpringDataJpaBootstrappingTest extends CausewayIntegrationTestAbstract {
 
     @Inject private Optional<PlatformTransactionManager> platformTransactionManager;
     @Inject private RepositoryService repository;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 91082b454a..965a97ccf8 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -49,7 +49,7 @@ import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
 import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
 import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.causeway.testing.integtestsupport.applib.IsisInteractionHandler;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
 
 import lombok.NonNull;
 import lombok.val;
@@ -64,7 +64,7 @@ import lombok.val;
 //                "logging.level.org.springframework.orm.jpa.*=DEBUG",
         })
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
-@ExtendWith({IsisInteractionHandler.class})
+@ExtendWith({CausewayInteractionHandler.class})
 @DirtiesContext
 @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
 class JpaTransactionRollbackTest_usingInteractionService
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
index 7e572eca70..98cef783fb 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
@@ -48,7 +48,7 @@ import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
 import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
 import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.causeway.testing.integtestsupport.applib.IsisInteractionHandler;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
 
 import lombok.NonNull;
 import lombok.val;
@@ -63,7 +63,7 @@ import lombok.val;
 //                "logging.level.org.springframework.orm.jpa.*=DEBUG",
         })
 @TestPropertySource(CausewayPresets.UseLog4j2Test)
-@ExtendWith({IsisInteractionHandler.class})
+@ExtendWith({CausewayInteractionHandler.class})
 @DirtiesContext
 @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
 class JpaTransactionRollbackTest_usingTransactionService
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
index 47c72f95f8..44ca77af0b 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactional.java
@@ -38,7 +38,7 @@ import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
 import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
 import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 /**
  * These tests use the {@code @Transactional} annotation as provided by Spring.
@@ -60,7 +60,7 @@ import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAb
 @DirtiesContext
 // @Disabled // ISIS-2789 revert
 class JpaTransactionRollbackTest_usingTransactional
-extends IsisIntegrationTestAbstract
+extends CausewayIntegrationTestAbstract
 {
 
     @Inject private FixtureScripts fixtureScripts;
diff --git a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 237b27b146..4af328934c 100644
--- a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++ b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -41,7 +41,7 @@ import org.apache.causeway.testdomain.jpa.entities.JpaBook;
 import org.apache.causeway.testdomain.util.interaction.InteractionBoundaryProbe;
 import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
 import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.causeway.testing.integtestsupport.applib.IsisInteractionHandler;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
 
 @SpringBootTest(
         classes = {
@@ -53,7 +53,7 @@ import org.apache.causeway.testing.integtestsupport.applib.IsisInteractionHandle
  * With this test we manage IsisInteractions ourselves. (not sub-classing IsisIntegrationTestAbstract)
  */
 @DirtiesContext
-@ExtendWith(IsisInteractionHandler.class)
+@ExtendWith(CausewayInteractionHandler.class)
 @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
 class JpaTransactionScopeListenerTest {
 
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
index 8b69d66272..48495e4991 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/util/interaction/InteractionTestAbstract.java
@@ -43,14 +43,14 @@ import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
 import org.apache.causeway.testdomain.publishing.subscriber.EntityPropertyChangeSubscriberForTesting;
 import org.apache.causeway.testdomain.util.CollectionAssertions;
 import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import lombok.val;
 
-public abstract class InteractionTestAbstract extends IsisIntegrationTestAbstract {
+public abstract class InteractionTestAbstract extends CausewayIntegrationTestAbstract {
 
     @Inject protected ObjectManager objectManager;
     @Inject protected InteractionService interactionService;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index bd1ea0d64d..89ba6a54e1 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -25,14 +25,14 @@ import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts
 import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
 import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
 import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
-import org.apache.causeway.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
 /**
  * @since 2.x {@index}
  */
-public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
+public abstract class IsisIntegrationTestAbstractWithFixtures extends CausewayIntegrationTestAbstract {
 
     protected void run(final FixtureScript... fixtureScriptList) {
         this.fixtureScripts.run(fixtureScriptList);
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
similarity index 97%
rename from testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
index 01711c2929..cb8e6ea2ee 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
@@ -47,8 +47,8 @@ import lombok.RequiredArgsConstructor;
  *
  * @since 2.0 {@index}
  */
-@ExtendWith({ExceptionRecognizerTranslate.class, IsisInteractionHandler.class})
-public abstract class IsisIntegrationTestAbstract {
+@ExtendWith({ExceptionRecognizerTranslate.class, CausewayInteractionHandler.class})
+public abstract class CausewayIntegrationTestAbstract {
 
     /**
      * Hook to interact with
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisInteractionHandler.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
similarity index 95%
rename from testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisInteractionHandler.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
index e34b9ffaa6..d0aefbc1b4 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/IsisInteractionHandler.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayInteractionHandler.java
@@ -27,7 +27,7 @@ import org.apache.causeway.applib.services.iactnlayer.InteractionService;
 /**
  * @since 2.0 {@index}
  */
-public class IsisInteractionHandler implements BeforeEachCallback, AfterEachCallback {
+public class CausewayInteractionHandler implements BeforeEachCallback, AfterEachCallback {
 
     @Override
     public void beforeEach(final ExtensionContext extensionContext) throws Exception {
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 201feab441..5449a19bfe 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
@@ -34,9 +34,9 @@ class _Helper {
 
     static Optional<ServiceRegistry> getServiceRegistry(final ExtensionContext extensionContext) {
         return extensionContext.getTestInstance()
-        .filter(IsisIntegrationTestAbstract.class::isInstance)
-        .map(IsisIntegrationTestAbstract.class::cast)
-        .map(IsisIntegrationTestAbstract::getServiceRegistry);
+        .filter(CausewayIntegrationTestAbstract.class::isInstance)
+        .map(CausewayIntegrationTestAbstract.class::cast)
+        .map(CausewayIntegrationTestAbstract::getServiceRegistry);
     }
 
     /**