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 07:28:50 UTC

[isis] branch master updated: ISIS-3142: demo: recreate showcases from renamed templates

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 95dc3b5ea9 ISIS-3142: demo: recreate showcases from renamed templates
95dc3b5ea9 is described below

commit 95dc3b5ea9d5b811a3413146748ea1e015d33d9c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Oct 21 09:28:37 2022 +0200

    ISIS-3142: demo: recreate showcases from renamed templates
---
 .../causeway/commons/internal/base/_Files.java     |   3 ++
 .../src/main/java/demoapp/dom/DemoModuleJpa.java   |  31 ++++++-----
 .../types/{isis => causeway}/IsisTypesMenu.java    |  16 +++---
 .../{isis => causeway}/blobs/IsisBlobs-common.adoc |   0
 .../blobs/IsisBlobs-description.adoc               |   0
 .../types/{isis => causeway}/blobs/IsisBlobs.java  |   6 +--
 .../{isis => causeway}/blobs/IsisBlobs.layout.xml  |   0
 .../blobs/holder/IsisBlobHolder.java               |   2 +-
 .../blobs/holder/IsisBlobHolder2.java              |   2 +-
 .../holder/IsisBlobHolder_actionReturning.java     |   2 +-
 .../IsisBlobHolder_actionReturningCollection.java  |   2 +-
 .../blobs/holder/IsisBlobHolder_mixinProperty.java |   2 +-
 ...sBlobHolder_updateReadOnlyOptionalProperty.java |   2 +-
 .../IsisBlobHolder_updateReadOnlyProperty.java     |   2 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |   2 +-
 .../blobs/jdo/IsisBlobJdo-description.adoc         |   0
 .../{isis => causeway}/blobs/jdo/IsisBlobJdo.java  |   4 +-
 .../blobs/jdo/IsisBlobJdoEntities.java             |   2 +-
 .../blobs/jpa/IsisBlobJpa-description.adoc         |   0
 .../{isis => causeway}/blobs/jpa/IsisBlobJpa.java  |   4 +-
 .../blobs/jpa/IsisBlobJpaEntities.java             |   2 +-
 .../blobs/persistence/IsisBlobEntity.java          |   4 +-
 .../blobs/persistence/IsisBlobEntity.layout.xml    |   0
 .../blobs/persistence/IsisBlobSeeding.java         |   2 +-
 .../blobs/samples/IsisBlobsSamples.java            |   2 +-
 .../samples/compressed.tracemonkey-pldi-09.pdf     | Bin
 .../blobs/samples/file-sample_100kB.docx           | Bin
 .../blobs/samples/file-sample_150kB.pdf            | Bin
 .../blobs/samples/isis-logo-568x286.png            | Bin
 .../blobs/vm/IsisBlobVm-description.adoc           |   0
 .../{isis => causeway}/blobs/vm/IsisBlobVm.java    |   4 +-
 .../blobs/vm/IsisBlobVm.layout.xml                 |   0
 .../{isis => causeway}/clobs/IsisClobs-common.adoc |   0
 .../clobs/IsisClobs-description.adoc               |   0
 .../types/{isis => causeway}/clobs/IsisClobs.java  |   6 +--
 .../{isis => causeway}/clobs/IsisClobs.layout.xml  |   0
 .../clobs/holder/IsisClobHolder.java               |   2 +-
 .../clobs/holder/IsisClobHolder2.java              |   2 +-
 .../holder/IsisClobHolder_actionReturning.java     |   2 +-
 .../IsisClobHolder_actionReturningCollection.java  |   2 +-
 .../clobs/holder/IsisClobHolder_mixinProperty.java |   2 +-
 ...sClobHolder_updateReadOnlyOptionalProperty.java |   2 +-
 .../IsisClobHolder_updateReadOnlyProperty.java     |   2 +-
 ...obHolder_updateReadOnlyPropertyWithChoices.java |   2 +-
 .../clobs/jdo/IsisClobJdo-description.adoc         |   0
 .../{isis => causeway}/clobs/jdo/IsisClobJdo.java  |   4 +-
 .../clobs/jdo/IsisClobJdoEntities.java             |   2 +-
 .../clobs/jpa/IsisClobJpa-description.adoc         |   0
 .../{isis => causeway}/clobs/jpa/IsisClobJpa.java  |   4 +-
 .../clobs/jpa/IsisClobJpaEntities.java             |   2 +-
 .../clobs/persistence/IsisClobEntity.java          |   4 +-
 .../clobs/persistence/IsisClobEntity.layout.xml    |   0
 .../clobs/persistence/IsisClobSeeding.java         |   2 +-
 .../clobs/samples/IsisClobsSamples.java            |   2 +-
 .../{isis => causeway}/clobs/samples/all_well.xml  |   0
 .../{isis => causeway}/clobs/samples/document.txt  |   0
 .../clobs/samples/file-sample_100kB.rtf            |   0
 .../clobs/vm/IsisClobVm-description.adoc           |   0
 .../{isis => causeway}/clobs/vm/IsisClobVm.java    |   4 +-
 .../clobs/vm/IsisClobVm.layout.xml                 |   0
 .../IsisLocalResourcePaths-common.adoc             |   0
 .../IsisLocalResourcePaths-description.adoc        |   0
 .../localresourcepaths/IsisLocalResourcePaths.java |   6 +--
 .../IsisLocalResourcePaths.layout.xml              |   0
 .../holder/IsisLocalResourcePathHolder.java        |   2 +-
 .../holder/IsisLocalResourcePathHolder2.java       |   2 +-
 ...sisLocalResourcePathHolder_actionReturning.java |   2 +-
 ...sourcePathHolder_actionReturningCollection.java |   2 +-
 .../IsisLocalResourcePathHolder_mixinProperty.java |   2 +-
 ...ePathHolder_updateReadOnlyOptionalProperty.java |   2 +-
 ...lResourcePathHolder_updateReadOnlyProperty.java |   2 +-
 ...thHolder_updateReadOnlyPropertyWithChoices.java |   2 +-
 .../jdo/IsisLocalResourcePathJdo-description.adoc  |   0
 .../jdo/IsisLocalResourcePathJdo.java              |   4 +-
 .../jdo/IsisLocalResourcePathJdoEntities.java      |   2 +-
 .../jpa/IsisLocalResourcePathJpa-description.adoc  |   0
 .../jpa/IsisLocalResourcePathJpa.java              |   4 +-
 .../jpa/IsisLocalResourcePathJpaEntities.java      |   2 +-
 .../persistence/IsisLocalResourcePathEntity.java   |   4 +-
 .../IsisLocalResourcePathEntity.layout.xml         |   0
 .../persistence/IsisLocalResourcePathSeeding.java  |   2 +-
 .../samples/IsisLocalResourcePathsSamples.java     |   2 +-
 .../vm/IsisLocalResourcePathVm-description.adoc    |   0
 .../vm/IsisLocalResourcePathVm.java                |   4 +-
 .../vm/IsisLocalResourcePathVm.layout.xml          |   0
 .../markups/CausewayMarkups-common.adoc}           |  16 +++---
 .../markups/CausewayMarkups-description.adoc}      |  16 +++---
 .../markups/CausewayMarkups.java}                  |  18 +++----
 .../markups/CausewayMarkups.layout.xml}            |   6 +--
 .../markups/holder/CausewayMarkupHolder.java}      |   6 +--
 .../markups/holder/CausewayMarkupHolder2.java}     |   4 +-
 .../CausewayMarkupHolder_actionReturning.java}     |   6 +--
 ...wayMarkupHolder_actionReturningCollection.java} |   6 +--
 .../CausewayMarkupHolder_mixinProperty.java}       |   6 +--
 ...rkupHolder_updateReadOnlyOptionalProperty.java} |   8 +--
 ...updateReadOnlyOptionalPropertyWithChoices.java} |   8 +--
 ...usewayMarkupHolder_updateReadOnlyProperty.java} |   8 +--
 ...pHolder_updateReadOnlyPropertyWithChoices.java} |   8 +--
 .../jdo/CausewayMarkupJdo-description.adoc}        |  12 ++---
 .../markups/jdo/CausewayMarkupJdo.java}            |  12 ++---
 .../markups/jdo/CausewayMarkupJdoEntities.java}    |  14 ++---
 .../jpa/CausewayMarkupJpa-description.adoc}        |  12 ++---
 .../markups/jpa/CausewayMarkupJpa.java}            |  14 ++---
 .../markups/jpa/CausewayMarkupJpaEntities.java}    |  14 ++---
 .../markups/persistence/CausewayMarkupEntity.java} |  10 ++--
 .../persistence/CausewayMarkupEntity.layout.xml}   |   6 +--
 .../persistence/CausewayMarkupSeeding.java}        |   6 +--
 .../markups/samples/CausewayMarkupSamples.java}    |   4 +-
 .../markups/vm/CausewayMarkupVm-description.adoc}  |  10 ++--
 .../markups/vm/CausewayMarkupVm.java}              |  12 ++---
 .../markups/vm/CausewayMarkupVm.layout.xml}        |   6 +--
 .../passwords/IsisPasswords-common.adoc            |   0
 .../passwords/IsisPasswords-description.adoc       |   0
 .../passwords/IsisPasswords.java                   |   6 +--
 .../passwords/IsisPasswords.layout.xml             |   0
 .../passwords/holder/IsisPasswordHolder.java       |   2 +-
 .../passwords/holder/IsisPasswordHolder2.java      |   2 +-
 .../holder/IsisPasswordHolder_actionReturning.java |   2 +-
 ...isPasswordHolder_actionReturningCollection.java |   2 +-
 .../holder/IsisPasswordHolder_mixinProperty.java   |   2 +-
 ...swordHolder_updateReadOnlyOptionalProperty.java |   2 +-
 .../IsisPasswordHolder_updateReadOnlyProperty.java |   2 +-
 ...rdHolder_updateReadOnlyPropertyWithChoices.java |   2 +-
 .../passwords/jdo/IsisPasswordJdo-description.adoc |   0
 .../passwords/jdo/IsisPasswordJdo.java             |   4 +-
 .../passwords/jdo/IsisPasswordJdoEntities.java     |   2 +-
 .../passwords/jpa/IsisPasswordJpa-description.adoc |   0
 .../passwords/jpa/IsisPasswordJpa.java             |   4 +-
 .../passwords/jpa/IsisPasswordJpaEntities.java     |   2 +-
 .../passwords/persistence/IsisPasswordEntity.java  |   4 +-
 .../persistence/IsisPasswordEntity.layout.xml      |   0
 .../passwords/persistence/IsisPasswordSeeding.java |   2 +-
 .../passwords/samples/IsisPasswordsSamples.java    |   2 +-
 .../passwords/vm/IsisPasswordVm-description.adoc   |   0
 .../passwords/vm/IsisPasswordVm.java               |   4 +-
 .../passwords/vm/IsisPasswordVm.layout.xml         |   0
 .../{isisext => causewayext}/IsisExtTypesMenu.java |   4 +-
 .../cal/IsisCalendarEvents-common.adoc             |   0
 .../cal/IsisCalendarEvents-description.adoc        |   0
 .../cal/IsisCalendarEvents.java                    |   6 +--
 .../cal/IsisCalendarEvents.layout.xml              |   0
 .../cal/holder/IsisCalendarEventHolder.java        |   2 +-
 .../cal/holder/IsisCalendarEventHolder2.java       |   2 +-
 .../IsisCalendarEventHolder_actionReturning.java   |   2 +-
 ...endarEventHolder_actionReturningCollection.java |   2 +-
 .../IsisCalendarEventHolder_mixinProperty.java     |   2 +-
 ...EventHolder_updateReadOnlyOptionalProperty.java |   2 +-
 ...CalendarEventHolder_updateReadOnlyProperty.java |   2 +-
 ...ntHolder_updateReadOnlyPropertyWithChoices.java |   2 +-
 .../cal/jdo/IsisCalendarEventEntities.java         |   2 +-
 .../cal/jdo/IsisCalendarEventJdo-description.adoc  |   0
 .../cal/jdo/IsisCalendarEventJdo.java              |   4 +-
 .../cal/jpa/IsisCalendarEventEntities.java         |   2 +-
 .../cal/jpa/IsisCalendarEventJpa-description.adoc  |   0
 .../cal/jpa/IsisCalendarEventJpa.java              |   4 +-
 .../cal/persistence/IsisCalendarEventEntity.java   |   4 +-
 .../persistence/IsisCalendarEventEntity.layout.xml |   0
 .../cal/persistence/IsisCalendarEventSeeding.java  |   2 +-
 .../cal/samples/IsisCalendarEventSamples.java      |   2 +-
 .../cal/vm/IsisCalendarEventVm-description.adoc    |   0
 .../cal/vm/IsisCalendarEventVm.java                |   4 +-
 .../cal/vm/IsisCalendarEventVm.layout.xml          |   0
 .../sse/AsyncActionDemo-description.adoc           |   0
 .../sse/AsyncActionDemo.java                       |   2 +-
 .../sse/AsyncActionDemo.layout.xml                 |   0
 .../sse/AsyncActionMenu.java                       |   2 +-
 .../{isisext => causewayext}/sse/DemoTask.java     |   2 +-
 .../{isisext => causewayext}/sse/TaskProgress.java |   2 +-
 .../{isisval => causewayval}/IsisValTypesMenu.java |  20 +++----
 .../asciidocs/CausewayAsciiDocs-common.adoc}       |  16 +++---
 .../asciidocs/CausewayAsciiDocs-description.adoc}  |  16 +++---
 .../asciidocs/CausewayAsciiDocs.java}              |  18 +++----
 .../asciidocs/CausewayAsciiDocs.layout.xml}        |   6 +--
 .../asciidocs/holder/CausewayAsciiDocHolder.java}  |   6 +--
 .../asciidocs/holder/CausewayAsciiDocHolder2.java} |   4 +-
 .../CausewayAsciiDocHolder_actionReturning.java}   |   6 +--
 ...yAsciiDocHolder_actionReturningCollection.java} |   6 +--
 .../CausewayAsciiDocHolder_mixinProperty.java}     |   6 +--
 ...iDocHolder_updateReadOnlyOptionalProperty.java} |   8 +--
 ...updateReadOnlyOptionalPropertyWithChoices.java} |   8 +--
 ...ewayAsciiDocHolder_updateReadOnlyProperty.java} |   8 +--
 ...cHolder_updateReadOnlyPropertyWithChoices.java} |   8 +--
 .../jdo/CausewayAsciiDocJdo-description.adoc}      |  12 ++---
 .../asciidocs/jdo/CausewayAsciiDocJdo.java}        |  12 ++---
 .../jdo/CausewayAsciiDocJdoEntities.java}          |  14 ++---
 .../jpa/CausewayAsciiDocJpa-description.adoc}      |  12 ++---
 .../asciidocs/jpa/CausewayAsciiDocJpa.java}        |  14 ++---
 .../jpa/CausewayAsciiDocJpaEntities.java}          |  14 ++---
 .../persistence/CausewayAsciiDocEntity.java}       |  10 ++--
 .../persistence/CausewayAsciiDocEntity.layout.xml} |   6 +--
 .../persistence/CausewayAsciiDocSeeding.java}      |   6 +--
 .../vm/CausewayAsciiDocVm-description.adoc}        |  10 ++--
 .../asciidocs/vm/CausewayAsciiDocVm.java}          |  12 ++---
 .../asciidocs/vm/CausewayAsciiDocVm.layout.xml}    |   6 +--
 .../markdowns/CausewayMarkdowns-common.adoc}       |  16 +++---
 .../markdowns/CausewayMarkdowns-description.adoc}  |  16 +++---
 .../markdowns/CausewayMarkdowns.java}              |  18 +++----
 .../markdowns/CausewayMarkdowns.layout.xml}        |   6 +--
 .../markdowns/holder/CausewayMarkdownHolder.java}  |   6 +--
 .../markdowns/holder/CausewayMarkdownHolder2.java} |   4 +-
 .../CausewayMarkdownHolder_actionReturning.java}   |   6 +--
 ...yMarkdownHolder_actionReturningCollection.java} |   6 +--
 .../CausewayMarkdownHolder_mixinProperty.java}     |   6 +--
 ...downHolder_updateReadOnlyOptionalProperty.java} |   8 +--
 ...updateReadOnlyOptionalPropertyWithChoices.java} |   8 +--
 ...ewayMarkdownHolder_updateReadOnlyProperty.java} |   8 +--
 ...nHolder_updateReadOnlyPropertyWithChoices.java} |   8 +--
 .../jdo/CausewayMarkdownJdo-description.adoc}      |  12 ++---
 .../markdowns/jdo/CausewayMarkdownJdo.java}        |  12 ++---
 .../jdo/CausewayMarkdownJdoEntities.java}          |  14 ++---
 .../jpa/CausewayMarkdownJpa-description.adoc}      |  12 ++---
 .../markdowns/jpa/CausewayMarkdownJpa.java}        |  14 ++---
 .../jpa/CausewayMarkdownJpaEntities.java}          |  14 ++---
 .../persistence/CausewayMarkdownEntity.java}       |  10 ++--
 .../persistence/CausewayMarkdownEntity.layout.xml} |   6 +--
 .../persistence/CausewayMarkdownSeeding.java}      |   6 +--
 .../vm/CausewayMarkdownVm-description.adoc}        |  10 ++--
 .../markdowns/vm/CausewayMarkdownVm.java}          |  12 ++---
 .../markdowns/vm/CausewayMarkdownVm.layout.xml}    |   6 +--
 .../vegas/CausewayVegas-common.adoc}               |  16 +++---
 .../vegas/CausewayVegas-description.adoc}          |  16 +++---
 .../vegas/CausewayVegas.java}                      |  18 +++----
 .../vegas/CausewayVegas.layout.xml}                |   6 +--
 .../vegas/holder/CausewayVegaHolder.java}          |   6 +--
 .../vegas/holder/CausewayVegaHolder2.java}         |   4 +-
 .../CausewayVegaHolder_actionReturning.java}       |   6 +--
 ...sewayVegaHolder_actionReturningCollection.java} |   6 +--
 .../holder/CausewayVegaHolder_mixinProperty.java}  |   6 +--
 ...VegaHolder_updateReadOnlyOptionalProperty.java} |   8 +--
 ...updateReadOnlyOptionalPropertyWithChoices.java} |   8 +--
 ...CausewayVegaHolder_updateReadOnlyProperty.java} |   8 +--
 ...aHolder_updateReadOnlyPropertyWithChoices.java} |   8 +--
 .../vegas/jdo/CausewayVegaJdo-description.adoc}    |  12 ++---
 .../vegas/jdo/CausewayVegaJdo.java}                |  12 ++---
 .../vegas/jdo/CausewayVegaJdoEntities.java}        |  14 ++---
 .../vegas/jpa/CausewayVegaJpa-description.adoc}    |  12 ++---
 .../vegas/jpa/CausewayVegaJpa.java}                |  14 ++---
 .../vegas/jpa/CausewayVegaJpaEntities.java}        |  14 ++---
 .../vegas/persistence/CausewayVegaEntity.java}     |  10 ++--
 .../persistence/CausewayVegaEntity.layout.xml}     |   6 +--
 .../vegas/persistence/CausewayVegaSeeding.java}    |   6 +--
 .../vegas/samples/CausewayVegaSamples.java}        |   4 +-
 .../vegas/vm/CausewayVegaVm-description.adoc}      |  10 ++--
 .../vegas/vm/CausewayVegaVm.java}                  |  12 ++---
 .../vegas/vm/CausewayVegaVm.layout.xml}            |   6 +--
 .../java/demoapp/dom/types/isisschema/chg/.gitkeep |   0
 .../java/demoapp/dom/types/isisschema/cmd/.gitkeep |   0
 .../java/demoapp/dom/types/isisschema/ixn/.gitkeep |   0
 .../persistence/IsisMarkdownEntity.layout.xml      |  58 ---------------------
 .../isisval/markdowns/vm/IsisMarkdownVm.layout.xml |  58 ---------------------
 .../vegas/persistence/IsisVegaEntity.layout.xml    |  58 ---------------------
 .../types/isisval/vegas/vm/IsisVegaVm.layout.xml   |  58 ---------------------
 .../javalang/booleans/WrapperBooleans.layout.xml   |   6 +--
 .../jdo/WrapperBooleanJdo-description.adoc         |   6 +--
 .../jpa/WrapperBooleanJpa-description.adoc         |   6 +--
 .../persistence/WrapperBooleanEntity.layout.xml    |   6 +--
 .../booleans/vm/WrapperBooleanVm-description.adoc  |   4 +-
 .../booleans/vm/WrapperBooleanVm.layout.xml        |   6 +--
 .../types/javalang/bytes/WrapperBytes.layout.xml   |   6 +--
 .../bytes/jdo/WrapperByteJdo-description.adoc      |   6 +--
 .../bytes/jpa/WrapperByteJpa-description.adoc      |   6 +--
 .../bytes/persistence/WrapperByteEntity.layout.xml |   6 +--
 .../bytes/vm/WrapperByteVm-description.adoc        |   4 +-
 .../javalang/bytes/vm/WrapperByteVm.layout.xml     |   6 +--
 .../characters/WrapperCharacters.layout.xml        |   6 +--
 .../jdo/WrapperCharacterJdo-description.adoc       |   6 +--
 .../jpa/WrapperCharacterJpa-description.adoc       |   6 +--
 .../persistence/WrapperCharacterEntity.layout.xml  |   6 +--
 .../vm/WrapperCharacterVm-description.adoc         |   4 +-
 .../characters/vm/WrapperCharacterVm.layout.xml    |   6 +--
 .../javalang/doubles/WrapperDoubles.layout.xml     |   6 +--
 .../doubles/jdo/WrapperDoubleJdo-description.adoc  |   6 +--
 .../doubles/jpa/WrapperDoubleJpa-description.adoc  |   6 +--
 .../persistence/WrapperDoubleEntity.layout.xml     |   6 +--
 .../doubles/vm/WrapperDoubleVm-description.adoc    |   4 +-
 .../javalang/doubles/vm/WrapperDoubleVm.layout.xml |   6 +--
 .../types/javalang/enums/JavaLangEnums.layout.xml  |   6 +--
 .../enums/jdo/JavaLangEnumJdo-description.adoc     |   6 +--
 .../enums/jpa/JavaLangEnumJpa-description.adoc     |   6 +--
 .../persistence/JavaLangEnumEntity.layout.xml      |   6 +--
 .../enums/vm/JavaLangEnumVm-description.adoc       |   4 +-
 .../javalang/enums/vm/JavaLangEnumVm.layout.xml    |   6 +--
 .../types/javalang/floats/WrapperFloats.layout.xml |   6 +--
 .../floats/jdo/WrapperFloatJdo-description.adoc    |   6 +--
 .../floats/jpa/WrapperFloatJpa-description.adoc    |   6 +--
 .../persistence/WrapperFloatEntity.layout.xml      |   6 +--
 .../floats/vm/WrapperFloatVm-description.adoc      |   4 +-
 .../javalang/floats/vm/WrapperFloatVm.layout.xml   |   6 +--
 .../javalang/integers/WrapperIntegers.layout.xml   |   6 +--
 .../jdo/WrapperIntegerJdo-description.adoc         |   6 +--
 .../jpa/WrapperIntegerJpa-description.adoc         |   6 +--
 .../persistence/WrapperIntegerEntity.layout.xml    |   6 +--
 .../integers/vm/WrapperIntegerVm-description.adoc  |   4 +-
 .../integers/vm/WrapperIntegerVm.layout.xml        |   6 +--
 .../types/javalang/longs/WrapperLongs.layout.xml   |   6 +--
 .../longs/jdo/WrapperLongJdo-description.adoc      |   6 +--
 .../longs/jpa/WrapperLongJpa-description.adoc      |   6 +--
 .../longs/persistence/WrapperLongEntity.layout.xml |   6 +--
 .../longs/vm/WrapperLongVm-description.adoc        |   4 +-
 .../javalang/longs/vm/WrapperLongVm.layout.xml     |   6 +--
 .../types/javalang/shorts/WrapperShorts.layout.xml |   6 +--
 .../shorts/jdo/WrapperShortJdo-description.adoc    |   6 +--
 .../shorts/jpa/WrapperShortJpa-description.adoc    |   6 +--
 .../persistence/WrapperShortEntity.layout.xml      |   6 +--
 .../shorts/vm/WrapperShortVm-description.adoc      |   4 +-
 .../javalang/shorts/vm/WrapperShortVm.layout.xml   |   6 +--
 .../javalang/strings/JavaLangStrings.layout.xml    |   6 +--
 .../strings/jdo/JavaLangStringJdo-description.adoc |   6 +--
 .../strings/jpa/JavaLangStringJpa-description.adoc |   6 +--
 .../persistence/JavaLangStringEntity.layout.xml    |   6 +--
 .../strings/vm/JavaLangStringVm-description.adoc   |   4 +-
 .../strings/vm/JavaLangStringVm.layout.xml         |   6 +--
 .../types/javautil/uuids/JavaUtilUuids.layout.xml  |   6 +--
 .../uuids/jdo/JavaUtilUuidJdo-description.adoc     |   6 +--
 .../uuids/jpa/JavaUtilUuidJpa-description.adoc     |   6 +--
 .../persistence/JavaUtilUuidEntity.layout.xml      |   6 +--
 .../uuids/vm/JavaUtilUuidVm-description.adoc       |   4 +-
 .../javautil/uuids/vm/JavaUtilUuidVm.layout.xml    |   6 +--
 .../booleans/PrimitiveBooleans.layout.xml          |   6 +--
 ...rimitiveBooleanHolder_actionReturningArray.java |   3 +-
 .../persistence/PrimitiveBooleanEntity.layout.xml  |   6 +--
 .../booleans/vm/PrimitiveBooleanVm.layout.xml      |   6 +--
 .../primitive/bytes/PrimitiveBytes.layout.xml      |   6 +--
 .../PrimitiveByteHolder_actionReturningArray.java  |   3 +-
 .../persistence/PrimitiveByteEntity.layout.xml     |   6 +--
 .../primitive/bytes/vm/PrimitiveByteVm.layout.xml  |   6 +--
 .../primitive/chars/PrimitiveChars.layout.xml      |   6 +--
 .../PrimitiveCharHolder_actionReturningArray.java  |   3 +-
 .../persistence/PrimitiveCharEntity.layout.xml     |   6 +--
 .../primitive/chars/vm/PrimitiveCharVm.layout.xml  |   6 +--
 .../primitive/doubles/PrimitiveDoubles.layout.xml  |   6 +--
 ...PrimitiveDoubleHolder_actionReturningArray.java |   3 +-
 .../persistence/PrimitiveDoubleEntity.layout.xml   |   6 +--
 .../doubles/vm/PrimitiveDoubleVm.layout.xml        |   6 +--
 .../primitive/floats/PrimitiveFloats.layout.xml    |   6 +--
 .../PrimitiveFloatHolder_actionReturningArray.java |   3 +-
 .../persistence/PrimitiveFloatEntity.layout.xml    |   6 +--
 .../floats/vm/PrimitiveFloatVm.layout.xml          |   6 +--
 .../types/primitive/ints/PrimitiveInts.layout.xml  |   6 +--
 .../PrimitiveIntHolder_actionReturningArray.java   |   3 +-
 .../ints/persistence/PrimitiveIntEntity.layout.xml |   6 +--
 .../primitive/ints/vm/PrimitiveIntVm.layout.xml    |   6 +--
 .../primitive/longs/PrimitiveLongs.layout.xml      |   6 +--
 .../PrimitiveLongHolder_actionReturningArray.java  |   3 +-
 .../persistence/PrimitiveLongEntity.layout.xml     |   6 +--
 .../primitive/longs/vm/PrimitiveLongVm.layout.xml  |   6 +--
 .../primitive/shorts/PrimitiveShorts.layout.xml    |   6 +--
 .../PrimitiveShortHolder_actionReturningArray.java |   3 +-
 .../persistence/PrimitiveShortEntity.layout.xml    |   6 +--
 .../shorts/vm/PrimitiveShortVm.layout.xml          |   6 +--
 .../value/ValueTypeGenTemplateTest.java            |   4 +-
 351 files changed, 917 insertions(+), 1157 deletions(-)

diff --git a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
index 5f93f72dab..69525d9ad5 100644
--- a/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
+++ b/commons/src/main/java/org/apache/causeway/commons/internal/base/_Files.java
@@ -74,6 +74,9 @@ public class _Files {
             final Predicate<File> dirFilter,
             final Predicate<File> fileFilter,
             final Consumer<File> onFileFound) throws IOException {
+        if(!dir.exists()) {
+            return;
+        }
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir.toPath())) {
             for (Path path : stream) {
                 val file = path.toFile();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index 44527aa549..9d4e7cc9ad 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -18,14 +18,13 @@
  */
 package demoapp.dom;
 
+import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
+import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 
-import org.apache.causeway.extensions.commandlog.jpa.CausewayModuleExtCommandLogPersistenceJpa;
-import org.apache.causeway.persistence.jpa.eclipselink.CausewayModulePersistenceJpaEclipselink;
-
 import demoapp.dom.domain.actions.Action.commandPublishing.jpa.ActionCommandPublishingJpa;
 import demoapp.dom.domain.actions.Action.executionPublishing.jpa.ActionExecutionPublishingJpa;
 import demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.jpa.DomainObjectEntityChangePublishingDisabledJpa;
@@ -40,15 +39,15 @@ import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingC
 import demoapp.dom.services.core.eventbusservice.EventLogEntryJpa;
 import demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpa;
 import demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpa;
-import demoapp.dom.types.isis.blobs.jpa.IsisBlobJpa;
-import demoapp.dom.types.isis.clobs.jpa.IsisClobJpa;
-import demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpa;
-import demoapp.dom.types.isis.markups.jpa.IsisMarkupJpa;
-import demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpa;
-import demoapp.dom.types.isisext.cal.jpa.IsisCalendarEventJpa;
-import demoapp.dom.types.isisval.asciidocs.jpa.IsisAsciiDocJpa;
-import demoapp.dom.types.isisval.markdowns.jpa.IsisMarkdownJpa;
-import demoapp.dom.types.isisval.vegas.jpa.IsisVegaJpa;
+import demoapp.dom.types.causeway.blobs.jpa.IsisBlobJpa;
+import demoapp.dom.types.causeway.clobs.jpa.IsisClobJpa;
+import demoapp.dom.types.causeway.localresourcepaths.jpa.IsisLocalResourcePathJpa;
+import demoapp.dom.types.causeway.markups.jpa.CausewayMarkupJpa;
+import demoapp.dom.types.causeway.passwords.jpa.IsisPasswordJpa;
+import demoapp.dom.types.causewayext.cal.jpa.IsisCalendarEventJpa;
+import demoapp.dom.types.causewayval.asciidocs.jpa.CausewayAsciiDocJpa;
+import demoapp.dom.types.causewayval.markdowns.jpa.CausewayMarkdownJpa;
+import demoapp.dom.types.causewayval.vegas.jpa.CausewayVegaJpa;
 import demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpa;
 import demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpa;
 import demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpa;
@@ -94,11 +93,11 @@ import demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpa;
         IsisBlobJpa.class,
         IsisClobJpa.class,
         IsisLocalResourcePathJpa.class,
-        IsisMarkupJpa.class,
+        CausewayMarkupJpa.class,
         IsisPasswordJpa.class,
-        IsisAsciiDocJpa.class,
-        IsisMarkdownJpa.class,
-        IsisVegaJpa.class,
+        CausewayAsciiDocJpa.class,
+        CausewayMarkdownJpa.class,
+        CausewayVegaJpa.class,
         IsisCalendarEventJpa.class,
         EventLogEntryJpa.class,
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/IsisTypesMenu.java
similarity index 84%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/IsisTypesMenu.java
index d12a3c9a1f..28914ca7cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/IsisTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/IsisTypesMenu.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis;
+package demoapp.dom.types.causeway;
 
 import javax.inject.Named;
 
@@ -29,11 +29,11 @@ import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
-import demoapp.dom.types.isis.blobs.IsisBlobs;
-import demoapp.dom.types.isis.clobs.IsisClobs;
-import demoapp.dom.types.isis.localresourcepaths.IsisLocalResourcePaths;
-import demoapp.dom.types.isis.markups.IsisMarkups;
-import demoapp.dom.types.isis.passwords.IsisPasswords;
+import demoapp.dom.types.causeway.blobs.IsisBlobs;
+import demoapp.dom.types.causeway.clobs.IsisClobs;
+import demoapp.dom.types.causeway.localresourcepaths.IsisLocalResourcePaths;
+import demoapp.dom.types.causeway.markups.CausewayMarkups;
+import demoapp.dom.types.causeway.passwords.IsisPasswords;
 
 @Named("demo.IsisTypesMenu")
 @DomainService(
@@ -64,8 +64,8 @@ public class IsisTypesMenu {
     }
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-code")
-    public IsisMarkups markups(){
-        return new IsisMarkups();
+    public CausewayMarkups markups(){
+        return new CausewayMarkups();
     }
 
     @Action(semantics = SemanticsOf.SAFE)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs.java
index 470c057713..34bf998dea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs;
+package demoapp.dom.types.causeway.blobs;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.value.Blob;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
-import demoapp.dom.types.isis.blobs.vm.IsisBlobVm;
+import demoapp.dom.types.causeway.blobs.persistence.IsisBlobEntity;
+import demoapp.dom.types.causeway.blobs.vm.IsisBlobVm;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/IsisBlobs.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder.java
index dd05ad986b..1244203212 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import javax.inject.Named;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder2.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder2.java
index 0fd28a91f5..0dd2ffc6b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturning.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturning.java
index 2320e9d654..d6fc5a9930 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturningCollection.java
index 69aa8abd5e..41049c9ff1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_mixinProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_mixinProperty.java
index eded895086..23d5d25bf6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java
index 95307cccd4..53ca5d9d4c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java
index e6056b2bf7..e36aea6b52 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java
index 60a8e7924a..ce0e61fc7c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/holder/IsisBlobHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.holder;
+package demoapp.dom.types.causeway.blobs.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdo.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdo.java
index c4edc6f8d0..1dac53a1cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.jdo;
+package demoapp.dom.types.causeway.blobs.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.value.Blob;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
+import demoapp.dom.types.causeway.blobs.persistence.IsisBlobEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdoEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdoEntities.java
index c082f58712..bdc1e388b3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jdo/IsisBlobJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.jdo;
+package demoapp.dom.types.causeway.blobs.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpa.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpa.java
index e8ad86678d..3eb7fe011f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.jpa;
+package demoapp.dom.types.causeway.blobs.jpa;
 
 import javax.inject.Named;
 import javax.persistence.AttributeOverride;
@@ -43,7 +43,7 @@ import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
 
 import lombok.NoArgsConstructor;
 
-import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
+import demoapp.dom.types.causeway.blobs.persistence.IsisBlobEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpaEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpaEntities.java
index ee36c66064..597fe60788 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/jpa/IsisBlobJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.jpa;
+package demoapp.dom.types.causeway.blobs.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobEntity.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobEntity.java
index ce6dd3366a..d832579d11 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.persistence;
+package demoapp.dom.types.causeway.blobs.persistence;
 
 import javax.inject.Named;
 
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.value.Blob;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isis.blobs.holder.IsisBlobHolder2;
+import demoapp.dom.types.causeway.blobs.holder.IsisBlobHolder2;
 
 @Named("demo.IsisBlobEntity") // shared permissions with concrete sub class
 @DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobSeeding.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobSeeding.java
index 6fef37e633..645eff8c4c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/persistence/IsisBlobSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/persistence/IsisBlobSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.persistence;
+package demoapp.dom.types.causeway.blobs.persistence;
 
 import javax.inject.Inject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/IsisBlobsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/IsisBlobsSamples.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/IsisBlobsSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/IsisBlobsSamples.java
index e302533eba..f9fc71d2b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/IsisBlobsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/IsisBlobsSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.samples;
+package demoapp.dom.types.causeway.blobs.samples;
 
 import java.util.stream.Stream;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/compressed.tracemonkey-pldi-09.pdf b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/compressed.tracemonkey-pldi-09.pdf
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/compressed.tracemonkey-pldi-09.pdf
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/compressed.tracemonkey-pldi-09.pdf
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/file-sample_100kB.docx b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/file-sample_100kB.docx
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/file-sample_100kB.docx
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/file-sample_100kB.docx
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/file-sample_150kB.pdf b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/file-sample_150kB.pdf
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/file-sample_150kB.pdf
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/file-sample_150kB.pdf
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/isis-logo-568x286.png b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/isis-logo-568x286.png
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/samples/isis-logo-568x286.png
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/samples/isis-logo-568x286.png
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm.java
index a59bd4c8f2..a2a4b8879c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.blobs.vm;
+package demoapp.dom.types.causeway.blobs.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -38,7 +38,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.blobs.holder.IsisBlobHolder2;
+import demoapp.dom.types.causeway.blobs.holder.IsisBlobHolder2;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/blobs/vm/IsisBlobVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs.java
index 9effde2f3d..faa3fa9cd7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs;
+package demoapp.dom.types.causeway.clobs;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.value.Clob;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
-import demoapp.dom.types.isis.clobs.vm.IsisClobVm;
+import demoapp.dom.types.causeway.clobs.persistence.IsisClobEntity;
+import demoapp.dom.types.causeway.clobs.vm.IsisClobVm;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/IsisClobs.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder.java
index d028b25711..f1232b6bdf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import javax.inject.Named;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder2.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder2.java
index dd3e731462..433702dbc4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturning.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturning.java
index 1c8fadcac2..f01d069d6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturningCollection.java
index 108d1c5c90..1cdc78995e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_mixinProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_mixinProperty.java
index e8efb4f76e..502dc6322d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java
index e6e234e642..de8e795c0d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java
index 29278ca338..dea510d809 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java
index 3ad6d58eeb..e5a9dcdd8d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/holder/IsisClobHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.holder;
+package demoapp.dom.types.causeway.clobs.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdo.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdo.java
index 70994a61da..6d86699a39 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.jdo;
+package demoapp.dom.types.causeway.clobs.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.value.Clob;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
+import demoapp.dom.types.causeway.clobs.persistence.IsisClobEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdoEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdoEntities.java
index a4947e68f8..64c1e87d2d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jdo/IsisClobJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.jdo;
+package demoapp.dom.types.causeway.clobs.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpa.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpa.java
index 403e0abd8e..3ea9b9a4a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.jpa;
+package demoapp.dom.types.causeway.clobs.jpa;
 
 import javax.inject.Named;
 import javax.persistence.AttributeOverride;
@@ -43,7 +43,7 @@ import org.apache.causeway.persistence.jpa.applib.types.ClobJpaEmbeddable;
 
 import lombok.NoArgsConstructor;
 
-import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
+import demoapp.dom.types.causeway.clobs.persistence.IsisClobEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpaEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpaEntities.java
index 28545ea3c5..c33af63406 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jpa/IsisClobJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/jpa/IsisClobJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.jpa;
+package demoapp.dom.types.causeway.clobs.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobEntity.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobEntity.java
index 45be8f4e90..3924ad3492 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.persistence;
+package demoapp.dom.types.causeway.clobs.persistence;
 
 import javax.inject.Named;
 
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.value.Clob;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isis.clobs.holder.IsisClobHolder2;
+import demoapp.dom.types.causeway.clobs.holder.IsisClobHolder2;
 
 @Named("demo.IsisClobEntity") // shared permissions with concrete sub class
 @DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobSeeding.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobSeeding.java
index 71d2fbb695..136858bc06 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/persistence/IsisClobSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/persistence/IsisClobSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.persistence;
+package demoapp.dom.types.causeway.clobs.persistence;
 
 import javax.inject.Inject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/IsisClobsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/IsisClobsSamples.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/IsisClobsSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/IsisClobsSamples.java
index ced4f566c3..4139397654 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/IsisClobsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/IsisClobsSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.samples;
+package demoapp.dom.types.causeway.clobs.samples;
 
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Stream;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/all_well.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/all_well.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/all_well.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/all_well.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/document.txt b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/document.txt
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/document.txt
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/document.txt
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/file-sample_100kB.rtf b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/file-sample_100kB.rtf
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/samples/file-sample_100kB.rtf
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/samples/file-sample_100kB.rtf
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm.java
index 4b7f487392..4df1917be9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.clobs.vm;
+package demoapp.dom.types.causeway.clobs.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -38,7 +38,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.clobs.holder.IsisClobHolder2;
+import demoapp.dom.types.causeway.clobs.holder.IsisClobHolder2;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/clobs/vm/IsisClobVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths.java
index 6666d3c925..ad6388226a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths;
+package demoapp.dom.types.causeway.localresourcepaths;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.value.LocalResourcePath;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
-import demoapp.dom.types.isis.localresourcepaths.vm.IsisLocalResourcePathVm;
+import demoapp.dom.types.causeway.localresourcepaths.persistence.IsisLocalResourcePathEntity;
+import demoapp.dom.types.causeway.localresourcepaths.vm.IsisLocalResourcePathVm;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/IsisLocalResourcePaths.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder.java
index bcd326d797..a4f697f1b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import javax.inject.Named;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
index 7135e6e645..2d06334067 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java
index 8fab6f7b7a..c3be140c0d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java
index f27c22319c..e151ffd9f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
index 6c6c178195..731bfede26 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java
index 58f08fc0ff..687c17fa85 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java
index 44c581cc49..89062a6e61 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
index 7b57af2788..20b4e787a1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/holder/IsisLocalResourcePathHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.holder;
+package demoapp.dom.types.causeway.localresourcepaths.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
index b5d059693f..4bda6c09ba 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.jdo;
+package demoapp.dom.types.causeway.localresourcepaths.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -39,7 +39,7 @@ import org.apache.causeway.applib.value.LocalResourcePath;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
+import demoapp.dom.types.causeway.localresourcepaths.persistence.IsisLocalResourcePathEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java
index a48d1a7c80..0b1b79875b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jdo/IsisLocalResourcePathJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.jdo;
+package demoapp.dom.types.causeway.localresourcepaths.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
index 2743119917..b42853b2e4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.jpa;
+package demoapp.dom.types.causeway.localresourcepaths.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Column;
@@ -41,7 +41,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
+import demoapp.dom.types.causeway.localresourcepaths.persistence.IsisLocalResourcePathEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java
index 670a9ac633..1cb7ffd1d2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/jpa/IsisLocalResourcePathJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.jpa;
+package demoapp.dom.types.causeway.localresourcepaths.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathEntity.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathEntity.java
index 851974da94..c4954e5506 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.persistence;
+package demoapp.dom.types.causeway.localresourcepaths.persistence;
 
 import javax.inject.Named;
 
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.value.LocalResourcePath;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isis.localresourcepaths.holder.IsisLocalResourcePathHolder2;
+import demoapp.dom.types.causeway.localresourcepaths.holder.IsisLocalResourcePathHolder2;
 
 @Named("demo.IsisLocalResourcePathEntity") // shared permissions with concrete sub class
 @DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java
index 4b25c49c49..d3bc0ddf90 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/persistence/IsisLocalResourcePathSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.persistence;
+package demoapp.dom.types.causeway.localresourcepaths.persistence;
 
 import javax.inject.Inject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/samples/IsisLocalResourcePathsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/samples/IsisLocalResourcePathsSamples.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/samples/IsisLocalResourcePathsSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/samples/IsisLocalResourcePathsSamples.java
index 08b62d25aa..35ad1e5590 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/samples/IsisLocalResourcePathsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/samples/IsisLocalResourcePathsSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.samples;
+package demoapp.dom.types.causeway.localresourcepaths.samples;
 
 import java.util.stream.Stream;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm.java
index 4b7de10b92..33144929bf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.localresourcepaths.vm;
+package demoapp.dom.types.causeway.localresourcepaths.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -38,7 +38,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.localresourcepaths.holder.IsisLocalResourcePathHolder2;
+import demoapp.dom.types.causeway.localresourcepaths.holder.IsisLocalResourcePathHolder2;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/vm/IsisLocalResourcePathVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-common.adoc
similarity index 73%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-common.adoc
index d835cf93fa..9f0d462e01 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-common.adoc
@@ -4,28 +4,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisMarkdownHolder` interface, demonstrate the use of `org.apache.isis.valuetypes.markdown.applib.value.Markdown` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayMarkupHolder` interface, demonstrate the use of `org.apache.causeway.applib.value.Markup` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkdownHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayMarkupHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayMarkupHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkdownHolder_actionReturning.java[tags=class]
+include::holder/CausewayMarkupHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -33,7 +33,7 @@ include::holder/IsisMarkdownHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisMarkdownHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayMarkupHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -44,17 +44,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisMarkdownHolder_mixinProperty.java[tags=class]
+include::holder/CausewayMarkupHolder_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 `IsisMarkdownHolder2` interface:
+To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `CausewayMarkupHolder2` interface:
 
 [source,java]
 ----
-include::holder/IsisMarkdownHolder2.java[tags=class]
+include::holder/CausewayMarkupHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-description.adoc
similarity index 67%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-description.adoc
index 132251087c..36fdb1f977 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups-description.adoc
@@ -2,12 +2,12 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-The framework has built-in support for the `org.apache.isis.applib.value.Markup` data type.
+The framework has built-in support for the `org.apache.causeway.applib.value.Markup` data type.
 
 From here you can:
 
-* navigate to an entity that uses the `org.apache.isis.applib.value.Markup` datatype
-* open a view model that uses the `org.apache.isis.applib.value.Markup` datatype
+* navigate to an entity that uses the `org.apache.causeway.applib.value.Markup` datatype
+* open a view model that uses the `org.apache.causeway.applib.value.Markup` datatype
 
 Some properties on these domain objects are mandatory, some optional.
 
@@ -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.
 
-=== IsisMarkupHolder
+=== CausewayMarkupHolder
 
-The `IsisMarkupHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayMarkupHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisMarkupHolder.java[tags=class]
+include::holder/CausewayMarkupHolder.java[tags=class]
 ----
 
-=== IsisMarkupHolder2
+=== CausewayMarkupHolder2
 
-The `IsisMarkupHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayMarkupHolder2` 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.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
index 90973c3528..40cfb8b7c0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups;
+package demoapp.dom.types.causeway.markups;
 
 import java.util.List;
 
@@ -42,17 +42,17 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
-import demoapp.dom.types.isis.markups.vm.IsisMarkupVm;
+import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
+import demoapp.dom.types.causeway.markups.vm.CausewayMarkupVm;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @XmlRootElement(name = "Demo")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisMarkups")
+@Named("demo.CausewayMarkups")
 @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
 //@Log4j2
-public class IsisMarkups implements HasAsciiDocDescription {
+public class CausewayMarkups implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
         return "org.apache.causeway.applib.value.Markup data type";
@@ -60,21 +60,21 @@ public class IsisMarkups implements HasAsciiDocDescription {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
-    public IsisMarkupVm openViewModel(final org.apache.causeway.applib.value.Markup initialValue) {
-        return new IsisMarkupVm(initialValue);
+    public CausewayMarkupVm openViewModel(final org.apache.causeway.applib.value.Markup initialValue) {
+        return new CausewayMarkupVm(initialValue);
     }
     @MemberSupport public org.apache.causeway.applib.value.Markup default0OpenViewModel() {
         return samples.single();
     }
 
     @Collection
-    public List<? extends IsisMarkupEntity> getEntities() {
+    public List<? extends CausewayMarkupEntity> getEntities() {
         return entities.all();
     }
 
     @Inject
     @XmlTransient
-    ValueHolderRepository<org.apache.causeway.applib.value.Markup, ? extends IsisMarkupEntity> entities;
+    ValueHolderRepository<org.apache.causeway.applib.value.Markup, ? extends CausewayMarkupEntity> entities;
 
     @Inject
     @XmlTransient
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.layout.xml
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/CausewayMarkups.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
index 998362c0fa..1db07f6426 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder.java
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import javax.inject.Named;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisMarkupHolder")
+@Named("demo.CausewayMarkupHolder")
 //tag::class[]
-public interface IsisMarkupHolder {
+public interface CausewayMarkupHolder {
 
     org.apache.causeway.applib.value.Markup getReadOnlyProperty();
     void setReadOnlyProperty(org.apache.causeway.applib.value.Markup c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder2.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder2.java
index c445b91838..8b2e8ccda0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.Where;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
-public interface IsisMarkupHolder2 extends IsisMarkupHolder {
+public interface CausewayMarkupHolder2 extends CausewayMarkupHolder {
 
     @Property                                               // <.>
     @PropertyLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturning.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturning.java
index 3c32fdb892..9dab68e153 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
@@ -27,9 +27,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisMarkupHolder_actionReturning {
+public class CausewayMarkupHolder_actionReturning {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
     public org.apache.causeway.applib.value.Markup act() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
index 33042c1e44..0e5b323d1e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -33,9 +33,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisMarkupHolder_actionReturningCollection {
+public class CausewayMarkupHolder_actionReturningCollection {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
     public Collection<org.apache.causeway.applib.value.Markup> act() {
         return samples.stream()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_mixinProperty.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_mixinProperty.java
index 35de0d8017..0f99f1196e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
@@ -29,9 +29,9 @@ import lombok.RequiredArgsConstructor;
 @Property()
 @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkupHolder_mixinProperty {
+public class CausewayMarkupHolder_mixinProperty {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
     public org.apache.causeway.applib.value.Markup prop() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalProperty.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalProperty.java
index 75b3d96169..f1c1fa7f7d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkupHolder_updateReadOnlyOptionalProperty {
+public class CausewayMarkupHolder_updateReadOnlyOptionalProperty {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
-    @MemberSupport public IsisMarkupHolder act(
+    @MemberSupport public CausewayMarkupHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)              // <.>
             final org.apache.causeway.applib.value.Markup newValue
     ) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 0d1c0581a8..389670d962 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,11 +45,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices {
+public class CausewayMarkupHolder_updateReadOnlyOptionalPropertyWithChoices {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
-    @MemberSupport public IsisMarkupHolder act(
+    @MemberSupport public CausewayMarkupHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)
             final org.apache.causeway.applib.value.Markup newValue) {
         holder.setReadOnlyOptionalProperty(newValue);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyProperty.java
similarity index 86%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyProperty.java
index ad9a8dd79f..1ba01df39a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,11 +37,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkupHolder_updateReadOnlyProperty {
+public class CausewayMarkupHolder_updateReadOnlyProperty {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
-    @MemberSupport public IsisMarkupHolder act(final org.apache.causeway.applib.value.Markup newValue) {
+    @MemberSupport public CausewayMarkupHolder act(final org.apache.causeway.applib.value.Markup newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
similarity index 88%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
index 3468e25aec..142cc3110b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/holder/CausewayMarkupHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.holder;
+package demoapp.dom.types.causeway.markups.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,11 +43,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisMarkupHolder_updateReadOnlyPropertyWithChoices {
+public class CausewayMarkupHolder_updateReadOnlyPropertyWithChoices {
 
-    private final IsisMarkupHolder holder;
+    private final CausewayMarkupHolder holder;
 
-    @MemberSupport public IsisMarkupHolder act(final org.apache.causeway.applib.value.Markup newValue) {
+    @MemberSupport public CausewayMarkupHolder act(final org.apache.causeway.applib.value.Markup newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo-description.adoc
similarity index 71%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo-description.adoc
index 9e09b1238a..a25e526615 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JDO supports `org.apache.isis.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
+JDO supports `org.apache.causeway.applib.value.Markup` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisVegaJdo.java[tags=class]
+include::CausewayMarkupJdo.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::../IsisVegas-common.adoc[]
+include::../CausewayMarkups-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
index d833c988b3..ecd417f23c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.jdo;
+package demoapp.dom.types.causeway.markups.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,20 +38,20 @@ import org.apache.causeway.applib.annotation.Where;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
+import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 //tag::class[]
 @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
 @DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("demo.IsisMarkupEntity")
+@Named("demo.CausewayMarkupEntity")
 @DomainObject
-public class IsisMarkupJdo                                          // <.>
-        extends IsisMarkupEntity {
+public class CausewayMarkupJdo                                          // <.>
+        extends CausewayMarkupEntity {
 
 //end::class[]
-    public IsisMarkupJdo(final org.apache.causeway.applib.value.Markup initialValue) {
+    public CausewayMarkupJdo(final org.apache.causeway.applib.value.Markup initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdoEntities.java
similarity index 77%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdoEntities.java
index b491037e3c..8ef15afc2e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jdo/CausewayMarkupJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.jdo;
+package demoapp.dom.types.causeway.markups.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 @Service
-public class IsisMarkupJdoEntities
-extends ValueHolderRepository<org.apache.causeway.applib.value.Markup, IsisMarkupJdo> {
+public class CausewayMarkupJdoEntities
+extends ValueHolderRepository<org.apache.causeway.applib.value.Markup, CausewayMarkupJdo> {
 
-    protected IsisMarkupJdoEntities() {
-        super(IsisMarkupJdo.class);
+    protected CausewayMarkupJdoEntities() {
+        super(CausewayMarkupJdo.class);
     }
 
     @Override
-    protected IsisMarkupJdo newDetachedEntity(org.apache.causeway.applib.value.Markup value) {
-        return new IsisMarkupJdo(value);
+    protected CausewayMarkupJdo newDetachedEntity(org.apache.causeway.applib.value.Markup value) {
+        return new CausewayMarkupJdo(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa-description.adoc
similarity index 71%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa-description.adoc
index bba0f04269..de7209820d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JPA supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no special annotations are required.
+JPA supports `org.apache.causeway.applib.value.Markup` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkupJpa.java[tags=class]
+include::CausewayMarkupJpa.java[tags=class]
 ----
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
-include::../IsisMarkups-common.adoc[]
+include::../CausewayMarkups-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
index 0a7a44f122..ce19a891c0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.jpa;
+package demoapp.dom.types.causeway.markups.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Basic;
@@ -44,7 +44,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
+import demoapp.dom.types.causeway.markups.persistence.CausewayMarkupEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
@@ -52,17 +52,17 @@ import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
 @Entity
 @Table(
       schema = "demo",
-      name = "IsisMarkupJpa"
+      name = "CausewayMarkupJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.IsisMarkupEntity")
+@Named("demo.CausewayMarkupEntity")
 @DomainObject
 @NoArgsConstructor                                                             // <.>
-public class IsisMarkupJpa
-        extends IsisMarkupEntity {
+public class CausewayMarkupJpa
+        extends CausewayMarkupEntity {
 
 //end::class[]
-    public IsisMarkupJpa(final org.apache.causeway.applib.value.Markup initialValue) {
+    public CausewayMarkupJpa(final org.apache.causeway.applib.value.Markup initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpaEntities.java
similarity index 77%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpaEntities.java
index 6d930e8084..d48216a83f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/jpa/CausewayMarkupJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.jpa;
+package demoapp.dom.types.causeway.markups.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
 @Service
-public class IsisMarkupJpaEntities
-extends ValueHolderRepository<org.apache.causeway.applib.value.Markup, IsisMarkupJpa> {
+public class CausewayMarkupJpaEntities
+extends ValueHolderRepository<org.apache.causeway.applib.value.Markup, CausewayMarkupJpa> {
 
-    protected IsisMarkupJpaEntities() {
-        super(IsisMarkupJpa.class);
+    protected CausewayMarkupJpaEntities() {
+        super(CausewayMarkupJpa.class);
     }
 
     @Override
-    protected IsisMarkupJpa newDetachedEntity(org.apache.causeway.applib.value.Markup value) {
-        return new IsisMarkupJpa(value);
+    protected CausewayMarkupJpa newDetachedEntity(org.apache.causeway.applib.value.Markup value) {
+        return new CausewayMarkupJpa(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
index cb434d4fba..ae6889b083 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.persistence;
+package demoapp.dom.types.causeway.markups.persistence;
 
 import javax.inject.Named;
 
@@ -24,15 +24,15 @@ import org.apache.causeway.applib.annotation.DomainObject;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isis.markups.holder.IsisMarkupHolder2;
+import demoapp.dom.types.causeway.markups.holder.CausewayMarkupHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisMarkupEntity") // shared permissions with concrete sub class
+@Named("demo.CausewayMarkupEntity") // shared permissions with concrete sub class
 @DomainObject
-public abstract class IsisMarkupEntity
+public abstract class CausewayMarkupEntity
 implements
     HasAsciiDocDescription,
-    IsisMarkupHolder2,
+    CausewayMarkupHolder2,
     ValueHolder<org.apache.causeway.applib.value.Markup> {
 
     @Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.layout.xml
similarity index 85%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
index de709b440e..f83fca50da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/persistence/CausewayMarkupSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.persistence;
+package demoapp.dom.types.causeway.markups.persistence;
 
 import javax.inject.Inject;
 
@@ -27,11 +27,11 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisVegaSeeding
+public class CausewayMarkupSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public IsisVegaSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, ? extends IsisVegaEntity> entities) {
+    public CausewayMarkupSeeding(ValueHolderRepository<org.apache.causeway.applib.value.Markup, ? extends CausewayMarkupEntity> entities) {
         super(entities);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/samples/CausewayMarkupSamples.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/samples/CausewayMarkupSamples.java
index cc5d1a1ef4..791e687a86 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/samples/CausewayMarkupSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.samples;
+package demoapp.dom.types.causeway.markups.samples;
 
 import java.util.stream.Stream;
 
@@ -26,7 +26,7 @@ import demoapp.dom.types.Samples;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisMarkupSamples implements Samples<org.apache.causeway.applib.value.Markup> {
+public class CausewayMarkupSamples implements Samples<org.apache.causeway.applib.value.Markup> {
 
     @Override
     public Stream<org.apache.causeway.applib.value.Markup> stream() {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm-description.adoc
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm-description.adoc
index 6c7ab372ec..c60436bb74 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm-description.adoc
@@ -2,18 +2,18 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JAXB supports `org.apache.isis.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
+JAXB supports `org.apache.causeway.applib.value.Markup` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisVegaVm.java[tags=class]
+include::CausewayMarkupVm.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::../IsisVegas-common.adoc[]
+include::../CausewayMarkups-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
index c66effa80e..3cc4fc5f42 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.vm;
+package demoapp.dom.types.causeway.markups.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -37,22 +37,22 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.markups.holder.IsisMarkupHolder2;
+import demoapp.dom.types.causeway.markups.holder.CausewayMarkupHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisMarkupVm")
+@Named("demo.CausewayMarkupVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @lombok.NoArgsConstructor                                                       // <.>
-public class IsisMarkupVm
-        implements HasAsciiDocDescription, IsisMarkupHolder2 {
+public class CausewayMarkupVm
+        implements HasAsciiDocDescription, CausewayMarkupHolder2 {
 
 //end::class[]
-    public IsisMarkupVm(final org.apache.causeway.applib.value.Markup initialValue) {
+    public CausewayMarkupVm(final org.apache.causeway.applib.value.Markup initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.layout.xml
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/markups/vm/CausewayMarkupVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords.java
similarity index 93%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords.java
index 8ddd2f138e..14ff4ec6f4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords;
+package demoapp.dom.types.causeway.passwords;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.apache.causeway.applib.value.Password;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
-import demoapp.dom.types.isis.passwords.vm.IsisPasswordVm;
+import demoapp.dom.types.causeway.passwords.persistence.IsisPasswordEntity;
+import demoapp.dom.types.causeway.passwords.vm.IsisPasswordVm;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/IsisPasswords.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder.java
index 82863c5c16..ebe73b717a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import javax.inject.Named;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder2.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder2.java
index a83d80d9a1..71bf814ddf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturning.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturning.java
index 7c0ede96fe..8245714eb6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturningCollection.java
index 6ba79317d7..ca9a6d5f14 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_mixinProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_mixinProperty.java
index 87f69ccfbe..52c83cadfe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java
index 9083913dac..ea175916bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java
index c0fcf92ed3..dfc81628fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java
index dd004b68a2..7f92dd36f4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/holder/IsisPasswordHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.holder;
+package demoapp.dom.types.causeway.passwords.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdo.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdo.java
index d141e29ed8..2605777b22 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.jdo;
+package demoapp.dom.types.causeway.passwords.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,7 +38,7 @@ import org.apache.causeway.applib.value.Password;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
+import demoapp.dom.types.causeway.passwords.persistence.IsisPasswordEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdoEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdoEntities.java
index bce071be91..07a92261ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jdo/IsisPasswordJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.jdo;
+package demoapp.dom.types.causeway.passwords.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpa.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpa.java
index 77d65088ba..881b6ea517 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.jpa;
+package demoapp.dom.types.causeway.passwords.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Column;
@@ -41,7 +41,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
+import demoapp.dom.types.causeway.passwords.persistence.IsisPasswordEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpaEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpaEntities.java
index 0d8bef9f91..a80fce8c86 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jpa/IsisPasswordJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/jpa/IsisPasswordJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.jpa;
+package demoapp.dom.types.causeway.passwords.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordEntity.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordEntity.java
index 40787a7063..2f51fa3c45 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.persistence;
+package demoapp.dom.types.causeway.passwords.persistence;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -31,7 +31,7 @@ import org.apache.causeway.applib.value.Password;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isis.passwords.holder.IsisPasswordHolder2;
+import demoapp.dom.types.causeway.passwords.holder.IsisPasswordHolder2;
 
 @Named("demo.IsisPasswordEntity") // shared permissions with concrete sub class
 @DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordSeeding.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordSeeding.java
index fc63d774be..c5481cf719 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/persistence/IsisPasswordSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/persistence/IsisPasswordSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.persistence;
+package demoapp.dom.types.causeway.passwords.persistence;
 
 import javax.inject.Inject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/samples/IsisPasswordsSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/samples/IsisPasswordsSamples.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/samples/IsisPasswordsSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/samples/IsisPasswordsSamples.java
index c80fee3c59..f161cf8bcc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/samples/IsisPasswordsSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/samples/IsisPasswordsSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.samples;
+package demoapp.dom.types.causeway.passwords.samples;
 
 import java.util.Random;
 import java.util.stream.Stream;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm.java
index 7ddacb6658..ec1a12c681 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.passwords.vm;
+package demoapp.dom.types.causeway.passwords.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -38,7 +38,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.passwords.holder.IsisPasswordHolder2;
+import demoapp.dom.types.causeway.passwords.holder.IsisPasswordHolder2;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causeway/passwords/vm/IsisPasswordVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/IsisExtTypesMenu.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/IsisExtTypesMenu.java
index 9dc033b6f8..19ffd34587 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/IsisExtTypesMenu.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext;
+package demoapp.dom.types.causewayext;
 
 import javax.inject.Named;
 
@@ -29,7 +29,7 @@ import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
-import demoapp.dom.types.isisext.cal.IsisCalendarEvents;
+import demoapp.dom.types.causewayext.cal.IsisCalendarEvents;
 
 @Named("demo.IsisExtTypesMenu")
 @DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents.java
index 7eadc833d2..868fb9cd11 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal;
+package demoapp.dom.types.causewayext.cal;
 
 import java.util.List;
 
@@ -43,8 +43,8 @@ import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventEntity;
-import demoapp.dom.types.isisext.cal.vm.IsisCalendarEventVm;
+import demoapp.dom.types.causewayext.cal.persistence.IsisCalendarEventEntity;
+import demoapp.dom.types.causewayext.cal.vm.IsisCalendarEventVm;
 
 @XmlRootElement(name = "Demo")
 @XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/IsisCalendarEvents.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder.java
index fd2c4838f1..60fb0f54fd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import javax.inject.Named;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder2.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder2.java
index a7dd0a4173..aafc27255d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturning.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturning.java
index 29402b39a9..766808445f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java
index 92ef6c5f3d..3ca2c52e30 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_mixinProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_mixinProperty.java
index 6c6540c981..f524ed40a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java
index 6b6c5af0d2..0d60c221f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java
index 752b1b4a38..9e131e0209 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
index d28a6a50b0..05799a29ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/holder/IsisCalendarEventHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.holder;
+package demoapp.dom.types.causewayext.cal.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventEntities.java
index a537e1ac09..b7774be61c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.jdo;
+package demoapp.dom.types.causewayext.cal.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventJdo.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventJdo.java
index 023f09d7d7..6fdbe280a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jdo/IsisCalendarEventJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jdo/IsisCalendarEventJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.jdo;
+package demoapp.dom.types.causewayext.cal.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,7 +38,7 @@ import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventEntity;
+import demoapp.dom.types.causewayext.cal.persistence.IsisCalendarEventEntity;
 
 @Profile("demo-jdo")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventEntities.java
index 53ede3c578..f780487da1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.jpa;
+package demoapp.dom.types.causewayext.cal.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventJpa.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventJpa.java
index 09fe54b9e2..515d7aabfa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/jpa/IsisCalendarEventJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/jpa/IsisCalendarEventJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.jpa;
+package demoapp.dom.types.causewayext.cal.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Column;
@@ -41,7 +41,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isisext.cal.persistence.IsisCalendarEventEntity;
+import demoapp.dom.types.causewayext.cal.persistence.IsisCalendarEventEntity;
 
 @Profile("demo-jpa")
 //tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventEntity.java
similarity index 93%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventEntity.java
index b9cfa86ab3..9e91c8bc8b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.persistence;
+package demoapp.dom.types.causewayext.cal.persistence;
 
 import javax.inject.Named;
 
@@ -26,7 +26,7 @@ import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisext.cal.holder.IsisCalendarEventHolder2;
+import demoapp.dom.types.causewayext.cal.holder.IsisCalendarEventHolder2;
 
 @Named("demo.CalendarEventEntity") // shared permissions with concrete sub class
 @DomainObject
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventSeeding.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventSeeding.java
index 3f6a6b25ba..b5e4ba14ac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/persistence/IsisCalendarEventSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/persistence/IsisCalendarEventSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.persistence;
+package demoapp.dom.types.causewayext.cal.persistence;
 
 import javax.inject.Inject;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/samples/IsisCalendarEventSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/samples/IsisCalendarEventSamples.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/samples/IsisCalendarEventSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/samples/IsisCalendarEventSamples.java
index c35229e34c..dbc2eb3ff2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/samples/IsisCalendarEventSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/samples/IsisCalendarEventSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.samples;
+package demoapp.dom.types.causewayext.cal.samples;
 
 import java.util.stream.Stream;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm.java
index 2c82f07d3d..54edf37123 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.cal.vm;
+package demoapp.dom.types.causewayext.cal.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -38,7 +38,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisext.cal.holder.IsisCalendarEventHolder2;
+import demoapp.dom.types.causewayext.cal.holder.IsisCalendarEventHolder2;
 
 //tag::class[]
 @XmlRootElement(name = "root")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/vm/IsisCalendarEventVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/cal/vm/IsisCalendarEventVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
index 8868537f31..0ffbecb547 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.sse;
+package demoapp.dom.types.causewayext.sse;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionDemo.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionMenu.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionMenu.java
index f9df36b9f2..398d3f31f4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/AsyncActionMenu.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.sse;
+package demoapp.dom.types.causewayext.sse;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
index 612c31ad60..31f7c73361 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/DemoTask.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.sse;
+package demoapp.dom.types.causewayext.sse;
 
 import java.util.concurrent.atomic.LongAdder;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/TaskProgress.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/TaskProgress.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/TaskProgress.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/TaskProgress.java
index 5918ee3489..ce781d130a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/TaskProgress.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayext/sse/TaskProgress.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisext.sse;
+package demoapp.dom.types.causewayext.sse;
 
 import java.util.concurrent.atomic.LongAdder;
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/IsisValTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/IsisValTypesMenu.java
similarity index 79%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/IsisValTypesMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/IsisValTypesMenu.java
index 0f6a0daaf3..06e55cf4a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/IsisValTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/IsisValTypesMenu.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval;
+package demoapp.dom.types.causewayval;
 
 import javax.inject.Named;
 
@@ -29,9 +29,9 @@ import org.apache.causeway.applib.annotation.NatureOfService;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.SemanticsOf;
 
-import demoapp.dom.types.isisval.asciidocs.IsisAsciiDocs;
-import demoapp.dom.types.isisval.markdowns.IsisMarkdowns;
-import demoapp.dom.types.isisval.vegas.IsisVegas;
+import demoapp.dom.types.causewayval.asciidocs.CausewayAsciiDocs;
+import demoapp.dom.types.causewayval.markdowns.CausewayMarkdowns;
+import demoapp.dom.types.causewayval.vegas.CausewayVegas;
 
 @Named("demo.IsisValTypesMenu")
 @DomainService(
@@ -43,20 +43,20 @@ public class IsisValTypesMenu {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-pen-fancy")
-    public IsisAsciiDocs asciiDocs(){
-        return new IsisAsciiDocs();
+    public CausewayAsciiDocs asciiDocs(){
+        return new CausewayAsciiDocs();
     }
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-pen-fancy")
-    public IsisMarkdowns markdowns(){
-        return new IsisMarkdowns();
+    public CausewayMarkdowns markdowns(){
+        return new CausewayMarkdowns();
     }
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(cssClassFa="fa-chart-gantt")
-    public IsisVegas vegaCharts(){
-        return new IsisVegas();
+    public CausewayVegas vegaCharts(){
+        return new CausewayVegas();
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-common.adoc
similarity index 72%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-common.adoc
index 1582539584..8546ad6f90 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-common.adoc
@@ -4,28 +4,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisVegaHolder` interface, demonstrate the use of `org.apache.isis.valuetypes.vega.applib.value.Vega` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayAsciiDocHolder` interface, demonstrate the use of `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisVegaHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayAsciiDocHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisVegaHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayAsciiDocHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisVegaHolder_actionReturning.java[tags=class]
+include::holder/CausewayAsciiDocHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -33,7 +33,7 @@ include::holder/IsisVegaHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisVegaHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayAsciiDocHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -44,17 +44,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisVegaHolder_mixinProperty.java[tags=class]
+include::holder/CausewayAsciiDocHolder_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 `IsisVegaHolder2` interface:
+To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `CausewayAsciiDocHolder2` interface:
 
 [source,java]
 ----
-include::holder/IsisVegaHolder2.java[tags=class]
+include::holder/CausewayAsciiDocHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-description.adoc
similarity index 63%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-description.adoc
index 50d4d9192e..50c708c33d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs-description.adoc
@@ -2,12 +2,12 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-The framework has built-in support for the `org.apache.isis.valuetypes.vega.applib.value.Vega` data type.
+The framework has built-in support for the `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` data type.
 
 From here you can:
 
-* navigate to an entity that uses the `org.apache.isis.valuetypes.vega.applib.value.Vega` datatype
-* open a view model that uses the `org.apache.isis.valuetypes.vega.applib.value.Vega` datatype
+* navigate to an entity that uses the `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
+* open a view model that uses the `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
 
 Some properties on these domain objects are mandatory, some optional.
 
@@ -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.
 
-=== IsisVegaHolder
+=== CausewayAsciiDocHolder
 
-The `IsisVegaHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayAsciiDocHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisVegaHolder.java[tags=class]
+include::holder/CausewayAsciiDocHolder.java[tags=class]
 ----
 
-=== IsisVegaHolder2
+=== CausewayAsciiDocHolder2
 
-The `IsisVegaHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayAsciiDocHolder2` 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.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
similarity index 81%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
index bc25d6a9be..7eff60c5e0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs;
+package demoapp.dom.types.causewayval.asciidocs;
 
 import java.util.List;
 
@@ -42,17 +42,17 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
-import demoapp.dom.types.isisval.asciidocs.vm.IsisAsciiDocVm;
+import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
+import demoapp.dom.types.causewayval.asciidocs.vm.CausewayAsciiDocVm;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @XmlRootElement(name = "Demo")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisAsciiDocs")
+@Named("demo.CausewayAsciiDocs")
 @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
 //@Log4j2
-public class IsisAsciiDocs implements HasAsciiDocDescription {
+public class CausewayAsciiDocs implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
         return "org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc data type";
@@ -60,21 +60,21 @@ public class IsisAsciiDocs implements HasAsciiDocDescription {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
-    public IsisAsciiDocVm openViewModel(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
-        return new IsisAsciiDocVm(initialValue);
+    public CausewayAsciiDocVm openViewModel(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
+        return new CausewayAsciiDocVm(initialValue);
     }
     @MemberSupport public org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc default0OpenViewModel() {
         return samples.single();
     }
 
     @Collection
-    public List<? extends IsisAsciiDocEntity> getEntities() {
+    public List<? extends CausewayAsciiDocEntity> getEntities() {
         return entities.all();
     }
 
     @Inject
     @XmlTransient
-    ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends IsisAsciiDocEntity> entities;
+    ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends CausewayAsciiDocEntity> entities;
 
     @Inject
     @XmlTransient
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.layout.xml
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/CausewayAsciiDocs.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
index 0e28dcc1a5..14749d0482 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder.java
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import javax.inject.Named;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisAsciiDocHolder")
+@Named("demo.CausewayAsciiDocHolder")
 //tag::class[]
-public interface IsisAsciiDocHolder {
+public interface CausewayAsciiDocHolder {
 
     org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyProperty();
     void setReadOnlyProperty(org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder2.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder2.java
index 3158a75870..2516215256 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.Where;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
-public interface IsisAsciiDocHolder2 extends IsisAsciiDocHolder {
+public interface CausewayAsciiDocHolder2 extends CausewayAsciiDocHolder {
 
     @Property                                               // <.>
     @PropertyLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturning.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturning.java
index 87951846c4..df5913d711 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
@@ -27,9 +27,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_actionReturning {
+public class CausewayAsciiDocHolder_actionReturning {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
     public org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc act() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
index 72bf6b45c6..f6c7537fd8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -33,9 +33,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_actionReturningCollection {
+public class CausewayAsciiDocHolder_actionReturningCollection {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
     public Collection<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc> act() {
         return samples.stream()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_mixinProperty.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_mixinProperty.java
index cb79b6a18c..6fbf6d1a5d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
@@ -29,9 +29,9 @@ import lombok.RequiredArgsConstructor;
 @Property()
 @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_mixinProperty {
+public class CausewayAsciiDocHolder_mixinProperty {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
     public org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc prop() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalProperty.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalProperty.java
index 4e348f611e..a89d6398b9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_updateReadOnlyOptionalProperty {
+public class CausewayAsciiDocHolder_updateReadOnlyOptionalProperty {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
-    @MemberSupport public IsisAsciiDocHolder act(
+    @MemberSupport public CausewayAsciiDocHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)              // <.>
             final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue
     ) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 99e8d012de..fc96e73385 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,11 +45,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices {
+public class CausewayAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
-    @MemberSupport public IsisAsciiDocHolder act(
+    @MemberSupport public CausewayAsciiDocHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)
             final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
         holder.setReadOnlyOptionalProperty(newValue);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyProperty.java
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyProperty.java
index e20c306873..b4091e2952 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,11 +37,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_updateReadOnlyProperty {
+public class CausewayAsciiDocHolder_updateReadOnlyProperty {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
-    @MemberSupport public IsisAsciiDocHolder act(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
+    @MemberSupport public CausewayAsciiDocHolder act(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
similarity index 87%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
index 8ccf3d793b..61e70baa62 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/holder/CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.holder;
+package demoapp.dom.types.causewayval.asciidocs.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,11 +43,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices {
+public class CausewayAsciiDocHolder_updateReadOnlyPropertyWithChoices {
 
-    private final IsisAsciiDocHolder holder;
+    private final CausewayAsciiDocHolder holder;
 
-    @MemberSupport public IsisAsciiDocHolder act(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
+    @MemberSupport public CausewayAsciiDocHolder act(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo-description.adoc
similarity index 70%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo-description.adoc
index 4159dc8c9b..c44bbb9623 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JDO supports `org.apache.isis.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
+JDO supports `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkdownJdo.java[tags=class]
+include::CausewayAsciiDocJdo.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::../IsisMarkdowns-common.adoc[]
+include::../CausewayAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
index 734f693b58..c65d685d87 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.jdo;
+package demoapp.dom.types.causewayval.asciidocs.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,20 +38,20 @@ import org.apache.causeway.applib.annotation.Where;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
+import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 //tag::class[]
 @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
 @DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("demo.IsisAsciiDocEntity")
+@Named("demo.CausewayAsciiDocEntity")
 @DomainObject
-public class IsisAsciiDocJdo                                          // <.>
-        extends IsisAsciiDocEntity {
+public class CausewayAsciiDocJdo                                          // <.>
+        extends CausewayAsciiDocEntity {
 
 //end::class[]
-    public IsisAsciiDocJdo(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
+    public CausewayAsciiDocJdo(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdoEntities.java
similarity index 74%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdoEntities.java
index 6f12e9b101..7fb854f852 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jdo/CausewayAsciiDocJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.jdo;
+package demoapp.dom.types.causewayval.asciidocs.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 @Service
-public class IsisAsciiDocJdoEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, IsisAsciiDocJdo> {
+public class CausewayAsciiDocJdoEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, CausewayAsciiDocJdo> {
 
-    protected IsisAsciiDocJdoEntities() {
-        super(IsisAsciiDocJdo.class);
+    protected CausewayAsciiDocJdoEntities() {
+        super(CausewayAsciiDocJdo.class);
     }
 
     @Override
-    protected IsisAsciiDocJdo newDetachedEntity(org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc value) {
-        return new IsisAsciiDocJdo(value);
+    protected CausewayAsciiDocJdo newDetachedEntity(org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc value) {
+        return new CausewayAsciiDocJdo(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa-description.adoc
similarity index 69%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa-description.adoc
index f68e5cf4ca..18e7c28ef6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JPA supports `org.apache.isis.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
+JPA supports `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisVegaJpa.java[tags=class]
+include::CausewayAsciiDocJpa.java[tags=class]
 ----
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
-include::../IsisVegas-common.adoc[]
+include::../CausewayAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
index ee6f414b1f..a6cded66bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.jpa;
+package demoapp.dom.types.causewayval.asciidocs.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Basic;
@@ -44,7 +44,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
+import demoapp.dom.types.causewayval.asciidocs.persistence.CausewayAsciiDocEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
@@ -52,17 +52,17 @@ import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
 @Entity
 @Table(
       schema = "demo",
-      name = "IsisAsciiDocJpa"
+      name = "CausewayAsciiDocJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.IsisAsciiDocEntity")
+@Named("demo.CausewayAsciiDocEntity")
 @DomainObject
 @NoArgsConstructor                                                             // <.>
-public class IsisAsciiDocJpa
-        extends IsisAsciiDocEntity {
+public class CausewayAsciiDocJpa
+        extends CausewayAsciiDocEntity {
 
 //end::class[]
-    public IsisAsciiDocJpa(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
+    public CausewayAsciiDocJpa(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpaEntities.java
similarity index 74%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpaEntities.java
index d545d0a1f3..50f5541e70 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/jpa/CausewayAsciiDocJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.jpa;
+package demoapp.dom.types.causewayval.asciidocs.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
 @Service
-public class IsisAsciiDocJpaEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, IsisAsciiDocJpa> {
+public class CausewayAsciiDocJpaEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, CausewayAsciiDocJpa> {
 
-    protected IsisAsciiDocJpaEntities() {
-        super(IsisAsciiDocJpa.class);
+    protected CausewayAsciiDocJpaEntities() {
+        super(CausewayAsciiDocJpa.class);
     }
 
     @Override
-    protected IsisAsciiDocJpa newDetachedEntity(org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc value) {
-        return new IsisAsciiDocJpa(value);
+    protected CausewayAsciiDocJpa newDetachedEntity(org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc value) {
+        return new CausewayAsciiDocJpa(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
index 0f4c68792e..1e61766c1d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.persistence;
+package demoapp.dom.types.causewayval.asciidocs.persistence;
 
 import javax.inject.Named;
 
@@ -24,15 +24,15 @@ import org.apache.causeway.applib.annotation.DomainObject;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisval.asciidocs.holder.IsisAsciiDocHolder2;
+import demoapp.dom.types.causewayval.asciidocs.holder.CausewayAsciiDocHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisAsciiDocEntity") // shared permissions with concrete sub class
+@Named("demo.CausewayAsciiDocEntity") // shared permissions with concrete sub class
 @DomainObject
-public abstract class IsisAsciiDocEntity
+public abstract class CausewayAsciiDocEntity
 implements
     HasAsciiDocDescription,
-    IsisAsciiDocHolder2,
+    CausewayAsciiDocHolder2,
     ValueHolder<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc> {
 
     @Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.layout.xml
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
similarity index 81%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
index 2e9e460c42..9e842665d4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/persistence/CausewayAsciiDocSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.persistence;
+package demoapp.dom.types.causewayval.asciidocs.persistence;
 
 import javax.inject.Inject;
 
@@ -27,11 +27,11 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisAsciiDocSeeding
+public class CausewayAsciiDocSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public IsisAsciiDocSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends IsisAsciiDocEntity> entities) {
+    public CausewayAsciiDocSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends CausewayAsciiDocEntity> entities) {
         super(entities);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm-description.adoc
similarity index 75%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm-description.adoc
index 2abeb3f841..b0d7102770 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm-description.adoc
@@ -2,18 +2,18 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JAXB supports `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
+JAXB supports `org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisAsciiDocVm.java[tags=class]
+include::CausewayAsciiDocVm.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::../IsisAsciiDocs-common.adoc[]
+include::../CausewayAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
index c29855433b..8dceb39073 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.asciidocs.vm;
+package demoapp.dom.types.causewayval.asciidocs.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -37,22 +37,22 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisval.asciidocs.holder.IsisAsciiDocHolder2;
+import demoapp.dom.types.causewayval.asciidocs.holder.CausewayAsciiDocHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisAsciiDocVm")
+@Named("demo.CausewayAsciiDocVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @lombok.NoArgsConstructor                                                       // <.>
-public class IsisAsciiDocVm
-        implements HasAsciiDocDescription, IsisAsciiDocHolder2 {
+public class CausewayAsciiDocVm
+        implements HasAsciiDocDescription, CausewayAsciiDocHolder2 {
 
 //end::class[]
-    public IsisAsciiDocVm(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
+    public CausewayAsciiDocVm(final org.apache.causeway.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.layout.xml
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/asciidocs/vm/CausewayAsciiDocVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-common.adoc
similarity index 72%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-common.adoc
index 47b06efcfc..b414d5b55d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-common.adoc
@@ -4,28 +4,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisMarkupHolder` interface, demonstrate the use of `org.apache.isis.applib.value.Markup` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayMarkdownHolder` interface, demonstrate the use of `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkupHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayMarkdownHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayMarkdownHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisMarkupHolder_actionReturning.java[tags=class]
+include::holder/CausewayMarkdownHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -33,7 +33,7 @@ include::holder/IsisMarkupHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisMarkupHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayMarkdownHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -44,17 +44,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisMarkupHolder_mixinProperty.java[tags=class]
+include::holder/CausewayMarkdownHolder_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 `IsisMarkupHolder2` interface:
+To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `CausewayMarkdownHolder2` interface:
 
 [source,java]
 ----
-include::holder/IsisMarkupHolder2.java[tags=class]
+include::holder/CausewayMarkdownHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-description.adoc
similarity index 65%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-description.adoc
index dbdaae27e6..aa3325a671 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns-description.adoc
@@ -2,12 +2,12 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-The framework has built-in support for the `org.apache.isis.valuetypes.markdown.applib.value.Markdown` data type.
+The framework has built-in support for the `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` data type.
 
 From here you can:
 
-* navigate to an entity that uses the `org.apache.isis.valuetypes.markdown.applib.value.Markdown` datatype
-* open a view model that uses the `org.apache.isis.valuetypes.markdown.applib.value.Markdown` datatype
+* navigate to an entity that uses the `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` datatype
+* open a view model that uses the `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` datatype
 
 Some properties on these domain objects are mandatory, some optional.
 
@@ -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.
 
-=== IsisMarkdownHolder
+=== CausewayMarkdownHolder
 
-The `IsisMarkdownHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayMarkdownHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisMarkdownHolder.java[tags=class]
+include::holder/CausewayMarkdownHolder.java[tags=class]
 ----
 
-=== IsisMarkdownHolder2
+=== CausewayMarkdownHolder2
 
-The `IsisMarkdownHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayMarkdownHolder2` 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.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
similarity index 81%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
index d838a98048..926287c606 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns;
+package demoapp.dom.types.causewayval.markdowns;
 
 import java.util.List;
 
@@ -42,17 +42,17 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
-import demoapp.dom.types.isisval.markdowns.vm.IsisMarkdownVm;
+import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
+import demoapp.dom.types.causewayval.markdowns.vm.CausewayMarkdownVm;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @XmlRootElement(name = "Demo")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisMarkdowns")
+@Named("demo.CausewayMarkdowns")
 @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
 //@Log4j2
-public class IsisMarkdowns implements HasAsciiDocDescription {
+public class CausewayMarkdowns implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
         return "org.apache.causeway.valuetypes.markdown.applib.value.Markdown data type";
@@ -60,21 +60,21 @@ public class IsisMarkdowns implements HasAsciiDocDescription {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
-    public IsisMarkdownVm openViewModel(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
-        return new IsisMarkdownVm(initialValue);
+    public CausewayMarkdownVm openViewModel(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
+        return new CausewayMarkdownVm(initialValue);
     }
     @MemberSupport public org.apache.causeway.valuetypes.markdown.applib.value.Markdown default0OpenViewModel() {
         return samples.single();
     }
 
     @Collection
-    public List<? extends IsisMarkdownEntity> getEntities() {
+    public List<? extends CausewayMarkdownEntity> getEntities() {
         return entities.all();
     }
 
     @Inject
     @XmlTransient
-    ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, ? extends IsisMarkdownEntity> entities;
+    ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, ? extends CausewayMarkdownEntity> entities;
 
     @Inject
     @XmlTransient
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.layout.xml
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/CausewayMarkdowns.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
index a0341795d0..22db831d32 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder.java
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import javax.inject.Named;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisMarkdownHolder")
+@Named("demo.CausewayMarkdownHolder")
 //tag::class[]
-public interface IsisMarkdownHolder {
+public interface CausewayMarkdownHolder {
 
     org.apache.causeway.valuetypes.markdown.applib.value.Markdown getReadOnlyProperty();
     void setReadOnlyProperty(org.apache.causeway.valuetypes.markdown.applib.value.Markdown c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder2.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder2.java
index abc0717f37..a9bbdcb412 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.Where;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
-public interface IsisMarkdownHolder2 extends IsisMarkdownHolder {
+public interface CausewayMarkdownHolder2 extends CausewayMarkdownHolder {
 
     @Property                                               // <.>
     @PropertyLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturning.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturning.java
index 37d252a5ae..f1e69b655b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
@@ -27,9 +27,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_actionReturning {
+public class CausewayMarkdownHolder_actionReturning {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
     public org.apache.causeway.valuetypes.markdown.applib.value.Markdown act() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
index 92eb9f5089..cc75b8d6c1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -33,9 +33,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_actionReturningCollection {
+public class CausewayMarkdownHolder_actionReturningCollection {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
     public Collection<org.apache.causeway.valuetypes.markdown.applib.value.Markdown> act() {
         return samples.stream()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_mixinProperty.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_mixinProperty.java
index 5f0f0ca74f..9a67ddd9e0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
@@ -29,9 +29,9 @@ import lombok.RequiredArgsConstructor;
 @Property()
 @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_mixinProperty {
+public class CausewayMarkdownHolder_mixinProperty {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
     public org.apache.causeway.valuetypes.markdown.applib.value.Markdown prop() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalProperty.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalProperty.java
index 815cc22852..b646bd4d6a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_updateReadOnlyOptionalProperty {
+public class CausewayMarkdownHolder_updateReadOnlyOptionalProperty {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
-    @MemberSupport public IsisMarkdownHolder act(
+    @MemberSupport public CausewayMarkdownHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)              // <.>
             final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue
     ) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
index f036996d65..2d66236421 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,11 +45,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices {
+public class CausewayMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
-    @MemberSupport public IsisMarkdownHolder act(
+    @MemberSupport public CausewayMarkdownHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)
             final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue) {
         holder.setReadOnlyOptionalProperty(newValue);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyProperty.java
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyProperty.java
index 3daf72a0bf..f4163ce311 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,11 +37,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_updateReadOnlyProperty {
+public class CausewayMarkdownHolder_updateReadOnlyProperty {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
-    @MemberSupport public IsisMarkdownHolder act(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue) {
+    @MemberSupport public CausewayMarkdownHolder act(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
similarity index 87%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
index 9da5d3e580..54ea10e12e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/holder/CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.holder;
+package demoapp.dom.types.causewayval.markdowns.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,11 +43,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisMarkdownHolder_updateReadOnlyPropertyWithChoices {
+public class CausewayMarkdownHolder_updateReadOnlyPropertyWithChoices {
 
-    private final IsisMarkdownHolder holder;
+    private final CausewayMarkdownHolder holder;
 
-    @MemberSupport public IsisMarkdownHolder act(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue) {
+    @MemberSupport public CausewayMarkdownHolder act(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo-description.adoc
similarity index 70%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo-description.adoc
index d63a5d587d..6edf42926a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JDO supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no special annotations are required.
+JDO supports `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkupJdo.java[tags=class]
+include::CausewayMarkdownJdo.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::../IsisMarkups-common.adoc[]
+include::../CausewayMarkdowns-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
index 7aef4dec40..54c6c3deea 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.jdo;
+package demoapp.dom.types.causewayval.markdowns.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,20 +38,20 @@ import org.apache.causeway.applib.annotation.Where;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
+import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 //tag::class[]
 @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
 @DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("demo.IsisMarkdownEntity")
+@Named("demo.CausewayMarkdownEntity")
 @DomainObject
-public class IsisMarkdownJdo                                          // <.>
-        extends IsisMarkdownEntity {
+public class CausewayMarkdownJdo                                          // <.>
+        extends CausewayMarkdownEntity {
 
 //end::class[]
-    public IsisMarkdownJdo(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
+    public CausewayMarkdownJdo(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdoEntities.java
similarity index 74%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdoEntities.java
index 2f83070df4..26f0783d42 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jdo/CausewayMarkdownJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.jdo;
+package demoapp.dom.types.causewayval.markdowns.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 @Service
-public class IsisMarkdownJdoEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, IsisMarkdownJdo> {
+public class CausewayMarkdownJdoEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, CausewayMarkdownJdo> {
 
-    protected IsisMarkdownJdoEntities() {
-        super(IsisMarkdownJdo.class);
+    protected CausewayMarkdownJdoEntities() {
+        super(CausewayMarkdownJdo.class);
     }
 
     @Override
-    protected IsisMarkdownJdo newDetachedEntity(org.apache.causeway.valuetypes.markdown.applib.value.Markdown value) {
-        return new IsisMarkdownJdo(value);
+    protected CausewayMarkdownJdo newDetachedEntity(org.apache.causeway.valuetypes.markdown.applib.value.Markdown value) {
+        return new CausewayMarkdownJdo(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa-description.adoc
similarity index 69%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa-description.adoc
index 8af38dfff6..7adf212043 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JPA supports `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
+JPA supports `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisAsciiDocJpa.java[tags=class]
+include::CausewayMarkdownJpa.java[tags=class]
 ----
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
-include::../IsisAsciiDocs-common.adoc[]
+include::../CausewayMarkdowns-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
index d3d929b978..88cccaa01f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.jpa;
+package demoapp.dom.types.causewayval.markdowns.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Basic;
@@ -44,7 +44,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
+import demoapp.dom.types.causewayval.markdowns.persistence.CausewayMarkdownEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
@@ -52,17 +52,17 @@ import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
 @Entity
 @Table(
       schema = "demo",
-      name = "IsisMarkdownJpa"
+      name = "CausewayMarkdownJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.IsisMarkdownEntity")
+@Named("demo.CausewayMarkdownEntity")
 @DomainObject
 @NoArgsConstructor                                                             // <.>
-public class IsisMarkdownJpa
-        extends IsisMarkdownEntity {
+public class CausewayMarkdownJpa
+        extends CausewayMarkdownEntity {
 
 //end::class[]
-    public IsisMarkdownJpa(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
+    public CausewayMarkdownJpa(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpaEntities.java
similarity index 74%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpaEntities.java
index f5f88bd0a6..90dc3265be 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/jpa/CausewayMarkdownJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.jpa;
+package demoapp.dom.types.causewayval.markdowns.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
 @Service
-public class IsisMarkdownJpaEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, IsisMarkdownJpa> {
+public class CausewayMarkdownJpaEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, CausewayMarkdownJpa> {
 
-    protected IsisMarkdownJpaEntities() {
-        super(IsisMarkdownJpa.class);
+    protected CausewayMarkdownJpaEntities() {
+        super(CausewayMarkdownJpa.class);
     }
 
     @Override
-    protected IsisMarkdownJpa newDetachedEntity(org.apache.causeway.valuetypes.markdown.applib.value.Markdown value) {
-        return new IsisMarkdownJpa(value);
+    protected CausewayMarkdownJpa newDetachedEntity(org.apache.causeway.valuetypes.markdown.applib.value.Markdown value) {
+        return new CausewayMarkdownJpa(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
index 25f6a068e6..de00c3cc5b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.persistence;
+package demoapp.dom.types.causewayval.markdowns.persistence;
 
 import javax.inject.Named;
 
@@ -24,15 +24,15 @@ import org.apache.causeway.applib.annotation.DomainObject;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisval.markdowns.holder.IsisMarkdownHolder2;
+import demoapp.dom.types.causewayval.markdowns.holder.CausewayMarkdownHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisMarkdownEntity") // shared permissions with concrete sub class
+@Named("demo.CausewayMarkdownEntity") // shared permissions with concrete sub class
 @DomainObject
-public abstract class IsisMarkdownEntity
+public abstract class CausewayMarkdownEntity
 implements
     HasAsciiDocDescription,
-    IsisMarkdownHolder2,
+    CausewayMarkdownHolder2,
     ValueHolder<org.apache.causeway.valuetypes.markdown.applib.value.Markdown> {
 
     @Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.layout.xml
similarity index 85%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
similarity index 81%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
index dcc574300c..509322d5e3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/persistence/CausewayMarkdownSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.persistence;
+package demoapp.dom.types.causewayval.markdowns.persistence;
 
 import javax.inject.Inject;
 
@@ -27,11 +27,11 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisMarkdownSeeding
+public class CausewayMarkdownSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public IsisMarkdownSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, ? extends IsisMarkdownEntity> entities) {
+    public CausewayMarkdownSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.markdown.applib.value.Markdown, ? extends CausewayMarkdownEntity> entities) {
         super(entities);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm-description.adoc
similarity index 75%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm-description.adoc
index 3c65c59e45..8b33f62857 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm-description.adoc
@@ -2,18 +2,18 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JAXB supports `org.apache.isis.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
+JAXB supports `org.apache.causeway.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkdownVm.java[tags=class]
+include::CausewayMarkdownVm.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::../IsisMarkdowns-common.adoc[]
+include::../CausewayMarkdowns-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
index 6620734ba0..e2eae1a6fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.markdowns.vm;
+package demoapp.dom.types.causewayval.markdowns.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -37,22 +37,22 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisval.markdowns.holder.IsisMarkdownHolder2;
+import demoapp.dom.types.causewayval.markdowns.holder.CausewayMarkdownHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisMarkdownVm")
+@Named("demo.CausewayMarkdownVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @lombok.NoArgsConstructor                                                       // <.>
-public class IsisMarkdownVm
-        implements HasAsciiDocDescription, IsisMarkdownHolder2 {
+public class CausewayMarkdownVm
+        implements HasAsciiDocDescription, CausewayMarkdownHolder2 {
 
 //end::class[]
-    public IsisMarkdownVm(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
+    public CausewayMarkdownVm(final org.apache.causeway.valuetypes.markdown.applib.value.Markdown initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.layout.xml
similarity index 85%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/markdowns/vm/CausewayMarkdownVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-common.adoc
similarity index 75%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-common.adoc
index dc27b9d116..482dfd633f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-common.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-common.adoc
@@ -4,28 +4,28 @@
 
 == Mixin actions
 
-A number of mixin actions contribute through the `IsisAsciiDocHolder` interface, demonstrate the use of `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` as a parameter and as a return type.
+A number of mixin actions contribute through the `CausewayVegaHolder` interface, demonstrate the use of `org.apache.causeway.valuetypes.vega.applib.value.Vega` as a parameter and as a return type.
 For example:
 
 * the `updateReadOnlyProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder_updateReadOnlyProperty.java[tags=class]
+include::holder/CausewayVegaHolder_updateReadOnlyProperty.java[tags=class]
 ----
 
 * the `updateReadOnlyOptionalProperty` action is:
 +
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java[tags=class]
+include::holder/CausewayVegaHolder_updateReadOnlyOptionalProperty.java[tags=class]
 ----
 
 * the `actionReturning` action is:
 +
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder_actionReturning.java[tags=class]
+include::holder/CausewayVegaHolder_actionReturning.java[tags=class]
 ----
 
 
@@ -33,7 +33,7 @@ include::holder/IsisAsciiDocHolder_actionReturning.java[tags=class]
 +
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder_actionReturningCollection.java[tags=class]
+include::holder/CausewayVegaHolder_actionReturningCollection.java[tags=class]
 ----
 
 == Mixin properties
@@ -44,17 +44,17 @@ We also use the interface to contribute a mixin property:
 +
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder_mixinProperty.java[tags=class]
+include::holder/CausewayVegaHolder_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 `IsisAsciiDocHolder2` interface:
+To demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`, the entity and view model objects both implement the extended `CausewayVegaHolder2` interface:
 
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder2.java[tags=class]
+include::holder/CausewayVegaHolder2.java[tags=class]
 ----
 
 <.> The default methods have annotations that are automatically inherited.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-description.adoc
similarity index 69%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-description.adoc
index 31860e8755..7a0f6e874b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas-description.adoc
@@ -2,12 +2,12 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-The framework has built-in support for the `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` data type.
+The framework has built-in support for the `org.apache.causeway.valuetypes.vega.applib.value.Vega` data type.
 
 From here you can:
 
-* navigate to an entity that uses the `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
-* open a view model that uses the `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
+* navigate to an entity that uses the `org.apache.causeway.valuetypes.vega.applib.value.Vega` datatype
+* open a view model that uses the `org.apache.causeway.valuetypes.vega.applib.value.Vega` datatype
 
 Some properties on these domain objects are mandatory, some optional.
 
@@ -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.
 
-=== IsisAsciiDocHolder
+=== CausewayVegaHolder
 
-The `IsisAsciiDocHolder` interface is used to contribute a number of mixins to both types:
+The `CausewayVegaHolder` interface is used to contribute a number of mixins to both types:
 
 [source,java]
 ----
-include::holder/IsisAsciiDocHolder.java[tags=class]
+include::holder/CausewayVegaHolder.java[tags=class]
 ----
 
-=== IsisAsciiDocHolder2
+=== CausewayVegaHolder2
 
-The `IsisAsciiDocHolder2` interface is used to demonstrate support for label positions using `@PropertyLayout(labelPosition=...)`.
+The `CausewayVegaHolder2` 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.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
index 634101507f..e6f76ddfd9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas;
+package demoapp.dom.types.causewayval.vegas;
 
 import java.util.List;
 
@@ -42,17 +42,17 @@ import org.apache.causeway.applib.annotation.SemanticsOf;
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolderRepository;
 import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisval.vegas.persistence.IsisVegaEntity;
-import demoapp.dom.types.isisval.vegas.vm.IsisVegaVm;
+import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
+import demoapp.dom.types.causewayval.vegas.vm.CausewayVegaVm;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @XmlRootElement(name = "Demo")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisVegas")
+@Named("demo.CausewayVegas")
 @DomainObject(nature=Nature.VIEW_MODEL, editing=Editing.ENABLED)
 //@Log4j2
-public class IsisVegas implements HasAsciiDocDescription {
+public class CausewayVegas implements HasAsciiDocDescription {
 
     @ObjectSupport public String title() {
         return "org.apache.causeway.valuetypes.vega.applib.value.Vega data type";
@@ -60,21 +60,21 @@ public class IsisVegas implements HasAsciiDocDescription {
 
     @Action(semantics = SemanticsOf.SAFE)
     @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
-    public IsisVegaVm openViewModel(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
-        return new IsisVegaVm(initialValue);
+    public CausewayVegaVm openViewModel(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
+        return new CausewayVegaVm(initialValue);
     }
     @MemberSupport public org.apache.causeway.valuetypes.vega.applib.value.Vega default0OpenViewModel() {
         return samples.single();
     }
 
     @Collection
-    public List<? extends IsisVegaEntity> getEntities() {
+    public List<? extends CausewayVegaEntity> getEntities() {
         return entities.all();
     }
 
     @Inject
     @XmlTransient
-    ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, ? extends IsisVegaEntity> entities;
+    ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, ? extends CausewayVegaEntity> entities;
 
     @Inject
     @XmlTransient
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.layout.xml
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/IsisVegas.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/CausewayVegas.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
similarity index 93%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
index 24e580178f..12ea7d53cf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder.java
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import javax.inject.Named;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisVegaHolder")
+@Named("demo.CausewayVegaHolder")
 //tag::class[]
-public interface IsisVegaHolder {
+public interface CausewayVegaHolder {
 
     org.apache.causeway.valuetypes.vega.applib.value.Vega getReadOnlyProperty();
     void setReadOnlyProperty(org.apache.causeway.valuetypes.vega.applib.value.Vega c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder2.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder2.java
index e290e5a35d..1f511b84e1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder2.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import org.apache.causeway.applib.annotation.LabelPosition;
 import org.apache.causeway.applib.annotation.Property;
@@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.Where;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
-public interface IsisVegaHolder2 extends IsisVegaHolder {
+public interface CausewayVegaHolder2 extends CausewayVegaHolder {
 
     @Property                                               // <.>
     @PropertyLayout(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturning.java
similarity index 89%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturning.java
index 40b084b554..f89785f585 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturning.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
@@ -27,9 +27,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisVegaHolder_actionReturning {
+public class CausewayVegaHolder_actionReturning {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
     public org.apache.causeway.valuetypes.vega.applib.value.Vega act() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
index 8b7740ec9d..303b189e5f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -33,9 +33,9 @@ import lombok.RequiredArgsConstructor;
 //tag::class[]
 @Action(semantics = SemanticsOf.SAFE)
 @RequiredArgsConstructor
-public class IsisVegaHolder_actionReturningCollection {
+public class CausewayVegaHolder_actionReturningCollection {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
     public Collection<org.apache.causeway.valuetypes.vega.applib.value.Vega> act() {
         return samples.stream()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_mixinProperty.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_mixinProperty.java
index 488ec6b22d..03cc9cd669 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_mixinProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import org.apache.causeway.applib.annotation.Property;
 import org.apache.causeway.applib.annotation.PropertyLayout;
@@ -29,9 +29,9 @@ import lombok.RequiredArgsConstructor;
 @Property()
 @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
 @RequiredArgsConstructor
-public class IsisVegaHolder_mixinProperty {
+public class CausewayVegaHolder_mixinProperty {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
     public org.apache.causeway.valuetypes.vega.applib.value.Vega prop() {
         return holder.getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalProperty.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalProperty.java
index 0e1c4b9f93..8198084145 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisVegaHolder_updateReadOnlyOptionalProperty {
+public class CausewayVegaHolder_updateReadOnlyOptionalProperty {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
-    @MemberSupport public IsisVegaHolder act(
+    @MemberSupport public CausewayVegaHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)              // <.>
             final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue
     ) {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 02d3c8a209..d26a8168e0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,11 +45,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyOptionalProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisVegaHolder_updateReadOnlyOptionalPropertyWithChoices {
+public class CausewayVegaHolder_updateReadOnlyOptionalPropertyWithChoices {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
-    @MemberSupport public IsisVegaHolder act(
+    @MemberSupport public CausewayVegaHolder act(
             @Parameter(optionality = Optionality.OPTIONAL)
             final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue) {
         holder.setReadOnlyOptionalProperty(newValue);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyProperty.java
similarity index 86%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyProperty.java
index 41daa53114..721f898672 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.ActionLayout;
@@ -37,11 +37,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "1")
 @RequiredArgsConstructor
-public class IsisVegaHolder_updateReadOnlyProperty {
+public class CausewayVegaHolder_updateReadOnlyProperty {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
-    @MemberSupport public IsisVegaHolder act(final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue) {
+    @MemberSupport public CausewayVegaHolder act(final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
similarity index 88%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
index 0ddcc3caa2..02f038bf76 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/holder/IsisVegaHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/holder/CausewayVegaHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.holder;
+package demoapp.dom.types.causewayval.vegas.holder;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,11 +43,11 @@ import lombok.RequiredArgsConstructor;
         , associateWith = "readOnlyProperty"
         , sequence = "2")
 @RequiredArgsConstructor
-public class IsisVegaHolder_updateReadOnlyPropertyWithChoices {
+public class CausewayVegaHolder_updateReadOnlyPropertyWithChoices {
 
-    private final IsisVegaHolder holder;
+    private final CausewayVegaHolder holder;
 
-    @MemberSupport public IsisVegaHolder act(final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue) {
+    @MemberSupport public CausewayVegaHolder act(final org.apache.causeway.valuetypes.vega.applib.value.Vega newValue) {
         holder.setReadOnlyProperty(newValue);
         return holder;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo-description.adoc
similarity index 71%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo-description.adoc
index f6528470f7..a839e03bcb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JDO supports `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
+JDO supports `org.apache.causeway.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisAsciiDocJdo.java[tags=class]
+include::CausewayVegaJdo.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::../IsisAsciiDocs-common.adoc[]
+include::../CausewayVegas-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
index 548fcc0c5a..94cae7df52 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdo.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.jdo;
+package demoapp.dom.types.causewayval.vegas.jdo;
 
 import javax.inject.Named;
 import javax.jdo.annotations.Column;
@@ -38,20 +38,20 @@ import org.apache.causeway.applib.annotation.Where;
 import lombok.Getter;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.vegas.persistence.IsisVegaEntity;
+import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 //tag::class[]
 @PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
 @DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
-@Named("demo.IsisVegaEntity")
+@Named("demo.CausewayVegaEntity")
 @DomainObject
-public class IsisVegaJdo                                          // <.>
-        extends IsisVegaEntity {
+public class CausewayVegaJdo                                          // <.>
+        extends CausewayVegaEntity {
 
 //end::class[]
-    public IsisVegaJdo(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
+    public CausewayVegaJdo(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdoEntities.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdoEntities.java
index f7ce5f1134..1be9d9d8fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jdo/IsisVegaJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jdo/CausewayVegaJdoEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.jdo;
+package demoapp.dom.types.causewayval.vegas.jdo;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jdo")
 @Service
-public class IsisVegaJdoEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, IsisVegaJdo> {
+public class CausewayVegaJdoEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, CausewayVegaJdo> {
 
-    protected IsisVegaJdoEntities() {
-        super(IsisVegaJdo.class);
+    protected CausewayVegaJdoEntities() {
+        super(CausewayVegaJdo.class);
     }
 
     @Override
-    protected IsisVegaJdo newDetachedEntity(org.apache.causeway.valuetypes.vega.applib.value.Vega value) {
-        return new IsisVegaJdo(value);
+    protected CausewayVegaJdo newDetachedEntity(org.apache.causeway.valuetypes.vega.applib.value.Vega value) {
+        return new CausewayVegaJdo(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa-description.adoc
similarity index 70%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa-description.adoc
index 50f1693376..449c635ae2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa-description.adoc
@@ -2,19 +2,19 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JPA supports `org.apache.isis.valuetypes.markdown.applib.value.Markdown` out-of-the-box, so no special annotations are required.
+JPA supports `org.apache.causeway.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkdownJpa.java[tags=class]
+include::CausewayVegaJpa.java[tags=class]
 ----
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
-include::../IsisMarkdowns-common.adoc[]
+include::../CausewayVegas-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
similarity index 91%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
index e7d2e3f1ab..ebd5157e60 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpa.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.jpa;
+package demoapp.dom.types.causewayval.vegas.jpa;
 
 import javax.inject.Named;
 import javax.persistence.Basic;
@@ -44,7 +44,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import demoapp.dom.types.isisval.vegas.persistence.IsisVegaEntity;
+import demoapp.dom.types.causewayval.vegas.persistence.CausewayVegaEntity;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
@@ -52,17 +52,17 @@ import demoapp.dom.types.isisval.vegas.persistence.IsisVegaEntity;
 @Entity
 @Table(
       schema = "demo",
-      name = "IsisVegaJpa"
+      name = "CausewayVegaJpa"
 )
 @EntityListeners(CausewayEntityListener.class)
-@Named("demo.IsisVegaEntity")
+@Named("demo.CausewayVegaEntity")
 @DomainObject
 @NoArgsConstructor                                                             // <.>
-public class IsisVegaJpa
-        extends IsisVegaEntity {
+public class CausewayVegaJpa
+        extends CausewayVegaEntity {
 
 //end::class[]
-    public IsisVegaJpa(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
+    public CausewayVegaJpa(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpaEntities.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpaEntities.java
index 53cf244f0c..c4f4a65822 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/jpa/IsisVegaJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/jpa/CausewayVegaJpaEntities.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.jpa;
+package demoapp.dom.types.causewayval.vegas.jpa;
 
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -26,16 +26,16 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Profile("demo-jpa")
 @Service
-public class IsisVegaJpaEntities
-extends ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, IsisVegaJpa> {
+public class CausewayVegaJpaEntities
+extends ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, CausewayVegaJpa> {
 
-    protected IsisVegaJpaEntities() {
-        super(IsisVegaJpa.class);
+    protected CausewayVegaJpaEntities() {
+        super(CausewayVegaJpa.class);
     }
 
     @Override
-    protected IsisVegaJpa newDetachedEntity(org.apache.causeway.valuetypes.vega.applib.value.Vega value) {
-        return new IsisVegaJpa(value);
+    protected CausewayVegaJpa newDetachedEntity(org.apache.causeway.valuetypes.vega.applib.value.Vega value) {
+        return new CausewayVegaJpa(value);
     }
 
 }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
index 67ef8c6e9a..458d9015cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.persistence;
+package demoapp.dom.types.causewayval.vegas.persistence;
 
 import javax.inject.Named;
 
@@ -24,15 +24,15 @@ import org.apache.causeway.applib.annotation.DomainObject;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisval.vegas.holder.IsisVegaHolder2;
+import demoapp.dom.types.causewayval.vegas.holder.CausewayVegaHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
-@Named("demo.IsisVegaEntity") // shared permissions with concrete sub class
+@Named("demo.CausewayVegaEntity") // shared permissions with concrete sub class
 @DomainObject
-public abstract class IsisVegaEntity
+public abstract class CausewayVegaEntity
 implements
     HasAsciiDocDescription,
-    IsisVegaHolder2,
+    CausewayVegaHolder2,
     ValueHolder<org.apache.causeway.valuetypes.vega.applib.value.Vega> {
 
     @Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.layout.xml
similarity index 85%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
similarity index 83%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
index a204664a20..49cbcbbfaf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/persistence/CausewayVegaSeeding.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isis.markups.persistence;
+package demoapp.dom.types.causewayval.vegas.persistence;
 
 import javax.inject.Inject;
 
@@ -27,11 +27,11 @@ import demoapp.dom._infra.values.ValueHolderRepository;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisMarkupSeeding
+public class CausewayVegaSeeding
 extends SeedServiceAbstract {
 
     @Inject
-    public IsisMarkupSeeding(ValueHolderRepository<org.apache.causeway.applib.value.Markup, ? extends IsisMarkupEntity> entities) {
+    public CausewayVegaSeeding(ValueHolderRepository<org.apache.causeway.valuetypes.vega.applib.value.Vega, ? extends CausewayVegaEntity> entities) {
         super(entities);
     }
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/samples/IsisVegaSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/samples/CausewayVegaSamples.java
similarity index 88%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/samples/IsisVegaSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/samples/CausewayVegaSamples.java
index 6d8315a03a..b4994f8308 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/samples/IsisVegaSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/samples/CausewayVegaSamples.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.samples;
+package demoapp.dom.types.causewayval.vegas.samples;
 
 import java.util.stream.Stream;
 
@@ -26,7 +26,7 @@ import demoapp.dom.types.Samples;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 @Service
-public class IsisVegaSamples implements Samples<org.apache.causeway.valuetypes.vega.applib.value.Vega> {
+public class CausewayVegaSamples implements Samples<org.apache.causeway.valuetypes.vega.applib.value.Vega> {
 
     @Override
     public Stream<org.apache.causeway.valuetypes.vega.applib.value.Vega> stream() {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm-description.adoc
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm-description.adoc
index 6888d8b148..c257e2890c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm-description.adoc
@@ -2,18 +2,18 @@
 
 // // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
 
-JAXB supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no special annotations are required.
+JAXB supports `org.apache.causeway.valuetypes.vega.applib.value.Vega` out-of-the-box, so no special annotations are required.
 
 [source,java]
 ----
-include::IsisMarkupVm.java[tags=class]
+include::CausewayVegaVm.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::../IsisMarkups-common.adoc[]
+include::../CausewayVegas-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
index 4973a848c4..358aeb40a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package demoapp.dom.types.isisval.vegas.vm;
+package demoapp.dom.types.causewayval.vegas.vm;
 
 import javax.inject.Named;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -37,22 +37,22 @@ import lombok.Getter;
 import lombok.Setter;
 
 import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisval.vegas.holder.IsisVegaHolder2;
+import demoapp.dom.types.causewayval.vegas.holder.CausewayVegaHolder2;
 
 /* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
 //tag::class[]
 @XmlRootElement(name = "root")
 @XmlType
 @XmlAccessorType(XmlAccessType.FIELD)
-@Named("demo.IsisVegaVm")
+@Named("demo.CausewayVegaVm")
 @DomainObject(
         nature=Nature.VIEW_MODEL)
 @lombok.NoArgsConstructor                                                       // <.>
-public class IsisVegaVm
-        implements HasAsciiDocDescription, IsisVegaHolder2 {
+public class CausewayVegaVm
+        implements HasAsciiDocDescription, CausewayVegaHolder2 {
 
 //end::class[]
-    public IsisVegaVm(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
+    public CausewayVegaVm(final org.apache.causeway.valuetypes.vega.applib.value.Vega initialValue) {
         this.readOnlyProperty = initialValue;
         this.readWriteProperty = initialValue;
     }
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.layout.xml
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causewayval/vegas/vm/CausewayVegaVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/chg/.gitkeep b/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/chg/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/cmd/.gitkeep b/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/cmd/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/ixn/.gitkeep b/examples/demo/domain/src/main/java/demoapp/dom/types/isisschema/ixn/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.layout.xml
deleted file mode 100644
index c58ffa61a0..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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 agreed to in writing, software distributed under the
-	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/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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
-
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
-			<cpt:domainObject />
-			<cpt:action id="actionReturning"/>
-			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
-			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
-
-	<bs3:row>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
-			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
-			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
-			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
-			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
-			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Description" id="description" >
-				<cpt:action id="clearHints" position="PANEL" />
-				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
-				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
-				<cpt:property id="description"/>
-			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.layout.xml
deleted file mode 100644
index c58ffa61a0..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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 agreed to in writing, software distributed under the
-	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/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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
-
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
-			<cpt:domainObject />
-			<cpt:action id="actionReturning"/>
-			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
-			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
-
-	<bs3:row>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
-			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
-			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
-			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
-			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
-			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Description" id="description" >
-				<cpt:action id="clearHints" position="PANEL" />
-				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
-				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
-				<cpt:property id="description"/>
-			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.layout.xml
deleted file mode 100644
index c58ffa61a0..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/persistence/IsisVegaEntity.layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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 agreed to in writing, software distributed under the
-	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/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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
-
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
-			<cpt:domainObject />
-			<cpt:action id="actionReturning"/>
-			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
-			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
-
-	<bs3:row>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
-			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
-			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
-			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
-			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
-			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Description" id="description" >
-				<cpt:action id="clearHints" position="PANEL" />
-				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
-				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
-				<cpt:property id="description"/>
-			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.layout.xml
deleted file mode 100644
index c58ffa61a0..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/vegas/vm/IsisVegaVm.layout.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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 agreed to in writing, software distributed under the
-	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/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:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
-
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
-			<cpt:domainObject />
-			<cpt:action id="actionReturning"/>
-			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
-			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
-
-	<bs3:row>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
-			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
-			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
-			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
-			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
-			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
-			<cpt:fieldSet name="Description" id="description" >
-				<cpt:action id="clearHints" position="PANEL" />
-				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
-				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
-                <cpt:action id="recentCommands"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
-				<cpt:property id="description"/>
-			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc
index 864401ab28..952138e9e6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperBooleanJdo.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/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc
index 72c12477b5..24f8be81a2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jpa/WrapperBooleanJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperBooleanJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/persistence/WrapperBooleanEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc
index 1fdc8dba61..d57fdcbb27 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperBooleanVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
index f74b3f48d9..d72559ce69 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperByteJdo.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/javalang/bytes/jpa/WrapperByteJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
index 3f72a5f93d..24fce0e07e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jpa/WrapperByteJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperByteJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/persistence/WrapperByteEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
index 6bdad8f1c6..5093b338aa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperByteVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
index 9f16a5893e..451c9b19ac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperCharacterJdo.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/javalang/characters/jpa/WrapperCharacterJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
index 1741547bc1..914b85ef1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jpa/WrapperCharacterJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperCharacterJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/persistence/WrapperCharacterEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
index 70652022ae..96bcbb4a5d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperCharacterVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo-description.adoc
index f6a2b379e7..a59ba4d75a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperDoubleJdo.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/javalang/doubles/jpa/WrapperDoubleJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa-description.adoc
index dad52b5f19..45bf617927 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jpa/WrapperDoubleJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperDoubleJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/persistence/WrapperDoubleEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm-description.adoc
index 0f79d977ca..86edda24c5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperDoubleVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/JavaLangEnums.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo-description.adoc
index e902bdb1f8..b79446ca64 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jdo/JavaLangEnumJdo-description.adoc
@@ -11,9 +11,9 @@ include::JavaLangEnumJdo.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/javalang/enums/jpa/JavaLangEnumJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa-description.adoc
index 72c21e68a0..0fa12eeda9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/jpa/JavaLangEnumJpa-description.adoc
@@ -11,9 +11,9 @@ include::JavaLangEnumJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/persistence/JavaLangEnumEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/persistence/JavaLangEnumEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/persistence/JavaLangEnumEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/persistence/JavaLangEnumEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm-description.adoc
index b05c589933..05959ede6d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm-description.adoc
@@ -10,8 +10,8 @@ include::JavaLangEnumVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/enums/vm/JavaLangEnumVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo-description.adoc
index 9a2c4b3da4..6c1b6109fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperFloatJdo.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/javalang/floats/jpa/WrapperFloatJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa-description.adoc
index ad2dd1bb0f..8dcb45c493 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jpa/WrapperFloatJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperFloatJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/persistence/WrapperFloatEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/persistence/WrapperFloatEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/persistence/WrapperFloatEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/persistence/WrapperFloatEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm-description.adoc
index efa72c00cf..78a0e327e8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperFloatVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo-description.adoc
index cadc507d9a..cbe83daabf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperIntegerJdo.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/javalang/integers/jpa/WrapperIntegerJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa-description.adoc
index 5cedf2db3d..58201115ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jpa/WrapperIntegerJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperIntegerJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/persistence/WrapperIntegerEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/persistence/WrapperIntegerEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/persistence/WrapperIntegerEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/persistence/WrapperIntegerEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm-description.adoc
index 4aed5f9659..ab5bbf6c9a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperIntegerVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo-description.adoc
index af8bac8bf7..6e816e13cf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperLongJdo.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/javalang/longs/jpa/WrapperLongJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa-description.adoc
index c4293ac726..f8a0881128 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jpa/WrapperLongJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperLongJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/persistence/WrapperLongEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/persistence/WrapperLongEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/persistence/WrapperLongEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/persistence/WrapperLongEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm-description.adoc
index 1e60801abb..f046429811 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperLongVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
index 96a17bd1ab..e42142e2ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo-description.adoc
@@ -11,9 +11,9 @@ include::WrapperShortJdo.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/javalang/shorts/jpa/WrapperShortJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
index 7882b250ba..83d68bf6ce 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jpa/WrapperShortJpa-description.adoc
@@ -11,9 +11,9 @@ include::WrapperShortJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/persistence/WrapperShortEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
index 0a340ea158..7325b871c5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm-description.adoc
@@ -10,8 +10,8 @@ include::WrapperShortVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo-description.adoc
index d6c84bf105..28b0b914e8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo-description.adoc
@@ -11,9 +11,9 @@ include::JavaLangStringJdo.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/javalang/strings/jpa/JavaLangStringJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa-description.adoc
index e21a6f0b77..1f2ed1f5cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jpa/JavaLangStringJpa-description.adoc
@@ -11,9 +11,9 @@ include::JavaLangStringJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/persistence/JavaLangStringEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/persistence/JavaLangStringEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/persistence/JavaLangStringEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/persistence/JavaLangStringEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm-description.adoc
index 584a4dcde7..ee09de84ac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm-description.adoc
@@ -10,8 +10,8 @@ include::JavaLangStringVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc
index bdce913a97..b0c0603002 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo-description.adoc
@@ -11,9 +11,9 @@ include::JavaUtilUuidJdo.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/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc
index ee56c0f147..6c2379817a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jpa/JavaUtilUuidJpa-description.adoc
@@ -11,9 +11,9 @@ include::JavaUtilUuidJpa.java[tags=class]
 <.> a no-arg constructor for convenience
 <.> required property as defined to JPA.
 +
-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 JPA
 
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/persistence/JavaUtilUuidEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc
index b1bc7a598b..155fcf96d3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm-description.adoc
@@ -10,8 +10,8 @@ include::JavaUtilUuidVm.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.
 
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml
index c58ffa61a0..3df85c5777 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_actionReturningArray.java
index f9919b3463..f08c2fd266 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.booleans.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/persistence/PrimitiveBooleanEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/persistence/PrimitiveBooleanEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/persistence/PrimitiveBooleanEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/persistence/PrimitiveBooleanEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_actionReturningArray.java
index a7319ed3e7..8da2e93c18 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.bytes.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/persistence/PrimitiveByteEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/persistence/PrimitiveByteEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/persistence/PrimitiveByteEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/persistence/PrimitiveByteEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
index 38a8dd889d..1b20fccb55 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.chars.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/persistence/PrimitiveCharEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_actionReturningArray.java
index f99e664b62..f7a8c1d1da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.doubles.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/persistence/PrimitiveDoubleEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/persistence/PrimitiveDoubleEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/persistence/PrimitiveDoubleEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/persistence/PrimitiveDoubleEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_actionReturningArray.java
index 973dc661fb..8f10fbb7ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.floats.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/persistence/PrimitiveFloatEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/persistence/PrimitiveFloatEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/persistence/PrimitiveFloatEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/persistence/PrimitiveFloatEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_actionReturningArray.java
index abbcbb9caf..82bbdd89a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.ints.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/persistence/PrimitiveIntEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/persistence/PrimitiveIntEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/persistence/PrimitiveIntEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/persistence/PrimitiveIntEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_actionReturningArray.java
index 5a1f558081..d44d7f8ba6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.longs.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/persistence/PrimitiveLongEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/persistence/PrimitiveLongEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/persistence/PrimitiveLongEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/persistence/PrimitiveLongEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.layout.xml
index 247ed17506..48cd5c8fd1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_actionReturningArray.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_actionReturningArray.java
index 8518d2c112..069b802609 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_actionReturningArray.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_actionReturningArray.java
@@ -20,10 +20,9 @@ package demoapp.dom.types.primitive.shorts.holder;
 
 import javax.inject.Inject;
 
-import org.apache.causeway.commons.functional.IndexedConsumer;
-
 import org.apache.causeway.applib.annotation.Action;
 import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.commons.functional.IndexedConsumer;
 
 import demoapp.dom.types.Samples;
 import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/persistence/PrimitiveShortEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/persistence/PrimitiveShortEntity.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/persistence/PrimitiveShortEntity.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/persistence/PrimitiveShortEntity.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.layout.xml
index bf6c6ddd0c..de83fdb012 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.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">
 
 	<!-- This file was GENERATED by the showcase generator (tooling). Do NOT edit! -->
diff --git a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
index 3124cef60b..253f1c0f90 100644
--- a/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
+++ b/tooling/metaprog/src/test/java/org/apache/causeway/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
@@ -32,8 +32,6 @@ import org.apache.causeway.commons.internal.base._Files;
 import org.apache.causeway.commons.internal.base._Text;
 import org.apache.causeway.commons.internal.collections._Sets;
 import org.apache.causeway.commons.internal.functions._Predicates;
-import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueShowCase;
-import org.apache.causeway.tooling.metaprog.demoshowcases.value.ValueTypeGenTemplate;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -93,7 +91,7 @@ class ValueTypeGenTemplateTest {
     static void setup() {
         outputRootDir = PERSIST
                 ? _Files.makeDir(new File("D:/tmp/valueTypes"))
-                : _Files.tempDir("isis-tooling-showcases");
+                : _Files.tempDir("casueway-tooling-showcases");
 
         log.info("tmp dir created in {}", outputRootDir);
     }