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 2021/05/26 08:42:47 UTC

[isis] branch master updated: ISIS-2631: regen. index; update adoc

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 e282064  ISIS-2631: regen. index; update adoc
e282064 is described below

commit e282064ec8fc845589e6c25dd49e3bff28d79083
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 26 10:42:33 2021 +0200

    ISIS-2631: regen. index; update adoc
---
 .../applib/pages/index/IsisModuleApplib.adoc       |   4 +-
 .../pages/index/annotation/DomainObject.adoc       |  31 +-
 .../pages/index/annotation/DomainService.adoc      |  31 +-
 ....adoc => DomainObject_021-logicalTypeName.adoc} |   4 +-
 .../hooks/DomainService_021-objectType.adoc        |   6 +-
 .../pages/index/domain/DomainObjectList.adoc       |   2 +-
 .../modules/applib/pages/index/id/LogicalType.adoc |   6 +-
 .../layout/component/ServiceActionLayoutData.adoc  |   8 +-
 ...objectType.adoc => Object_logicalTypeName.adoc} |   8 +-
 .../mixins/metamodel/Object_objectIdentifier.adoc  |   2 +-
 .../DomainChangeRecord_openTargetObject.adoc       |   6 +-
 .../services/appfeat/ApplicationFeatureId.adoc     |   8 +-
 .../appfeatui/ApplicationFeatureMenu.adoc}         |  14 +-
 .../appfeatui/ApplicationFeatureViewModel.adoc     |  68 ++++
 .../services/appfeatui/ApplicationNamespace.adoc}  |  12 +-
 .../index/services/appfeatui/ApplicationType.adoc} |  13 +-
 .../services/appfeatui/ApplicationTypeAction.adoc} |  12 +-
 .../appfeatui/ApplicationTypeCollection.adoc}      |  13 +-
 .../services/appfeatui/ApplicationTypeMember.adoc} |  10 +-
 .../appfeatui/ApplicationTypeProperty.adoc}        |  20 +-
 .../index/services/bookmark/BookmarkService.adoc   |   4 +-
 .../applib/pages/index/services/bookmark/Oid.adoc  |  14 +
 .../BookmarkService_020-examples-and-usage.adoc    |   2 +-
 .../index/services/confview/ConfigurationMenu.adoc |   2 +-
 .../services/confview/ConfigurationProperty.adoc   |   2 +-
 .../index/services/layout/LayoutServiceMenu.adoc   |   2 +-
 .../index/services/metamodel/MetaModelService.adoc |  10 +-
 .../services/metamodel/MetaModelServiceMenu.adoc   |   2 +-
 .../pages/index/services/user/ImpersonateMenu.adoc |  16 +-
 .../pages/index/services/user/RoleMemento.adoc     |   2 +-
 .../pages/index/services/user/UserMemento.adoc     |   2 +-
 .../services/wrapper/events/InteractionEvent.adoc  |   4 +-
 .../manager/AuthorizationManager.adoc              |  43 +++
 .../authorization/manager/AuthorizorChooser.adoc}  |  19 +-
 .../commandlog/jdo/ui/CommandServiceMenu.adoc      |   2 +-
 .../primary/restapi/CommandRetrievalService.adoc   |   2 +-
 .../primary/ui/CommandReplayOnPrimaryService.adoc  |   2 +-
 .../ui/CommandReplayOnSecondaryService.adoc        |   2 +-
 .../hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc  |   2 +-
 .../secman/api/SecurityRealmCharacteristic.adoc    |  13 -
 .../encryption/PasswordEncryptionServiceNone.adoc  |  14 -
 .../api/permission/dom/ApplicationPermission.adoc  |  67 ----
 .../index/secman/api/role/dom/ApplicationRole.adoc |  34 --
 .../index/secman/api/user/dom/ApplicationUser.adoc |  62 ----
 .../IsisModuleExtSecmanApplib.adoc}                |   6 +-
 .../{api => applib}/SecmanConfiguration.adoc       |   2 +
 .../permission/dom/ApplicationPermission.adoc      |  35 +++
 .../permission/dom/ApplicationPermissionMode.adoc  |   4 +-
 .../dom/ApplicationPermissionRepository.adoc       |   2 +
 .../permission/dom/ApplicationPermissionRule.adoc  |   4 +-
 .../permission/dom/ApplicationPermissionValue.adoc |   2 +-
 .../dom/ApplicationPermissionValueSet.adoc         |   2 +-
 .../spi/PermissionsEvaluationService.adoc          |   2 +-
 .../spi/PermissionsEvaluationServiceAbstract.adoc  |   0
 ...PermissionsEvaluationServiceAllowBeatsVeto.adoc |   0
 ...PermissionsEvaluationServiceVetoBeatsAllow.adoc |   0
 .../role/dom/ApplicationRole.adoc}                 |  20 +-
 .../role/dom/ApplicationRoleRepository.adoc        |   0
 .../seed/IsisAppFeatureRoleAndPermissions.adoc}    |   9 +-
 .../seed}/IsisConfigurationRoleAndPermissions.adoc |   0
 .../seed}/IsisExtH2ConsoleRoleAndPermissions.adoc  |   0
 .../IsisExtSecmanAdminRoleAndPermissions.adoc      |   0
 ...IsisExtSecmanRegularUserRoleAndPermissions.adoc |   4 +-
 ...sPersistenceJdoMetaModelRoleAndPermissions.adoc |   0
 .../IsisSudoImpersonateRoleAndPermissions.adoc     |   0
 ...werRestfulObjectsSwaggerRoleAndPermissions.adoc |   0
 .../seed/SeedSecurityModuleService.adoc            |   0
 .../scripts/SeedUsersAndRolesFixtureScript.adoc    |   2 +-
 .../tenancy/dom/ApplicationTenancy.adoc            |  23 +-
 .../tenancy/dom/ApplicationTenancyRepository.adoc  |   0
 .../{api => applib}/tenancy/dom/HasAtPath.adoc     |   6 +-
 .../tenancy/seed}/GlobalTenancy.adoc               |   0
 .../tenancy/spi/ApplicationTenancyEvaluator.adoc   |  10 +-
 .../{api => applib}/user/dom/AccountType.adoc      |   0
 .../user/dom/ApplicationUser.adoc}                 |  32 +-
 .../user/dom/ApplicationUserRepository.adoc        |   0
 .../user/dom/ApplicationUserStatus.adoc            |  10 +-
 .../user/events/UserCreatedEvent.adoc              |   0
 .../{api => applib}/user/menu/MeService.adoc       |   2 +-
 .../user/seed}/IsisExtSecmanAdminUser.adoc         |   0
 .../user/spi}/PasswordEncryptionService.adoc       |   0
 .../IsisModuleExtSecmanIntegration.adoc}           |   6 +-
 .../authorizor/AuthorizorSecman.adoc               |   0
 .../userreg/UserRegistrationServiceForSecman.adoc} |   8 +-
 .../shiro/IsisModuleExtSecmanShiroRealm.adoc       |   1 -
 .../services/SecurityRealmServiceUsingShiro.adoc   |  13 -
 .../pages/index/excel/testing/ExcelFixture.adoc    |   2 +-
 .../pages/index/excel/testing/ExcelFixture2.adoc   |   2 +-
 .../index/h2console/ui/services/H2ManagerMenu.adoc |   2 +-
 .../common/applib/mixins/Object_impersonate.adoc   |   1 +
 .../applib/mixins/Object_impersonateWithRoles.adoc |   9 +-
 .../service/swagger/SwaggerServiceMenu.adoc        |   2 +-
 .../modules/applib-ant/pages/Discriminator.adoc    |   2 +-
 .../applib-ant/pages/PersistenceCapable.adoc       |   2 +-
 .../applib-classes/pages/mixees-and-mixins.adoc    |   2 +-
 .../applib-classes/partials/module-nav.adoc        |   2 +-
 .../domain-entities.adoc                           |   4 +-
 .../src/main/adoc/modules/schema/pages/cmd.adoc    |   2 +-
 .../src/main/adoc/modules/schema/pages/common.adoc |   2 +-
 core/adoc/modules/_overview/pages/about.adoc       | 345 ++++++++++++++++++---
 .../sections/isis.core.meta-model.validator.adoc   |   4 +-
 .../modules/metamodel/pages/class-diagram.adoc     |   2 +-
 .../secman/adoc/modules/secman/pages/about.adoc    |   4 +-
 .../jdo/adoc/modules/ROOT/pages/db-schemas.adoc    |   2 +-
 .../ROOT/pages/setup-and-configuration.adoc        |   4 +-
 .../jpa/adoc/modules/ROOT/pages/db-schemas.adoc    |   2 +-
 .../adoc/modules/starters/pages/simpleapp.adoc     |   2 +-
 .../ROOT/pages/hints-and-tips/troubleshooting.adoc |   2 +-
 .../hints-and-tips/view-model-as-parameter.adoc    |   4 +-
 109 files changed, 767 insertions(+), 445 deletions(-)

diff --git a/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc b/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc
index 2c15eaa..7c5e775 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc
@@ -10,8 +10,10 @@ class IsisModuleApplib {
   public static final String NAMESPACE;
   // for configuration; to minimize the risk of granting perms accidentally
 public static final String NAMESPACE_CONF;
-  // for configuration; to minimize the risk of granting perms accidentally
+  // for impersonation
 public static final String NAMESPACE_SUDO;
+  // for app features
+public static final String NAMESPACE_FEAT;
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
index 90d0c22..4505a16 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainObject.adoc
@@ -18,6 +18,7 @@ Domain semantics for domain objects (entities and view models; for services see
   String mixinMethod() default "$$";     // <.>
   Nature nature() default Nature.NOT_SPECIFIED;     // <.>
   String objectType() default "";     // <.>
+  String logicalTypeName() default "";     // <.>
   Class<? extends ObjectCreatedEvent<?>> createdLifecycleEvent() default ObjectCreatedEvent.Default.class;     // <.>
   Class<? extends ObjectPersistingEvent<?>> persistingLifecycleEvent() default ObjectPersistingEvent.Default.class;     // <.>
   Class<? extends ObjectPersistedEvent<?>> persistedLifecycleEvent() default ObjectPersistedEvent.Default.class;     // <.>
@@ -74,7 +75,19 @@ The nature of this domain object.
 <.> xref:#objectType[objectType]
 +
 --
-Provides a unique abbreviation for the object type's, eg "customer.Customer" for Customer.
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#logicalTypeName()_ instead
+====
+
+Synonym for _#logicalTypeName()_ .
+--
+<.> xref:#logicalTypeName[logicalTypeName]
++
+--
+The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.Customer_ for a class 'org.mycompany.dom.Customer'
 --
 <.> xref:#createdLifecycleEvent[createdLifecycleEvent]
 +
@@ -186,9 +199,21 @@ The nature of this domain object.
 [#objectType]
 === objectType
 
-Provides a unique abbreviation for the object type's, eg "customer.Customer" for Customer.
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#logicalTypeName()_ instead
+====
+
+Synonym for _#logicalTypeName()_ .
+
+[#logicalTypeName]
+=== logicalTypeName
+
+The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.Customer_ for a class 'org.mycompany.dom.Customer'
 
-This value, if specified, is used in the serialized form of the object's OID. An OID is used by the framework to unique identify an object over time (same concept as a URN).
+This value, if specified, is used in the serialized form of the object's xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] . A xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is used by the framework to uniquely identify an object over time (same concept as a URN). Otherwise, if not specified, the fully qualified class name is used instead.
 
 [#createdLifecycleEvent]
 === createdLifecycleEvent
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
index 6724cb9..c899aec 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DomainService.adoc
@@ -13,6 +13,7 @@ Also indicates whether the domain service acts as a repository for an entity, an
 @interface DomainService {
   NatureOfService nature() default NatureOfService.VIEW;     // <.>
   String objectType() default "";     // <.>
+  String logicalTypeName() default "";     // <.>
 }
 ----
 
@@ -24,7 +25,19 @@ The nature of this service, either in the UI or REST only
 <.> xref:#objectType[objectType]
 +
 --
-Provides a unique abbreviation for the object type's, eg "customer.CustomerService" for CustomerService.
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#logicalTypeName()_ instead
+====
+
+Synonym for _#logicalTypeName()_ .
+--
+<.> xref:#logicalTypeName[logicalTypeName]
++
+--
+The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.CustomerService_ for a class 'org.mycompany.services.CustomerService'
 --
 
 == Members
@@ -37,9 +50,21 @@ The nature of this service, either in the UI or REST only
 [#objectType]
 === objectType
 
-Provides a unique abbreviation for the object type's, eg "customer.CustomerService" for CustomerService.
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#logicalTypeName()_ instead
+====
+
+Synonym for _#logicalTypeName()_ .
+
+[#logicalTypeName]
+=== logicalTypeName
+
+The logical name of this object's type, that uniquely and fully qualifies it. The logical name is analogous to - but independent of - the actual fully qualified class name. eg. _sales.CustomerService_ for a class 'org.mycompany.services.CustomerService'
 
-This value, if specified, is used in the serialized form of the object's OID. An OID is used by the framework to unique identify an object over time (same concept as a URN).
+This value, if specified, is used in the serialized form of the object's xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] . A xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] is used by the framework to uniquely identify an object over time (same concept as a URN). Otherwise, if not specified, the fully qualified class name is used instead.
 
 include::hooks/DomainService_010-examples-and-usage.adoc[]
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-objectType.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-logicalTypeName.adoc
similarity index 97%
rename from antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-objectType.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-logicalTypeName.adoc
index b1c0620..2692ebf 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-objectType.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainObject_021-logicalTypeName.adoc
@@ -22,7 +22,7 @@ For example:
 [source,java]
 ----
 @DomainObject(
-    objectType="orders.Order"
+    logicalTypeName="orders.Order"
 )
 public class Order {
     ...
@@ -33,7 +33,7 @@ public class Order {
 
 The rules of precedence are:
 
-. `@DomainObject#objectType`
+. `@DomainObject#logicalTypeName`
 . ORM-specific:
 
 .. JDO: xref:refguide:applib-ant:PersistenceCapable.adoc[@PersistenceCapable], if at least the `schema` attribute is defined.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainService_021-objectType.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainService_021-objectType.adoc
index 6b7910d..b4f2d03 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainService_021-objectType.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/hooks/DomainService_021-objectType.adoc
@@ -4,7 +4,7 @@
 :page-partial:
 
 
-The xref:refguide:applib:index/annotation/DomainService.adoc#objectType[objectType()] element is used to provide a unique alias for the domain service's class name.
+The xref:refguide:applib:index/annotation/DomainService.adoc#logicalTypeName[logicalTypeName()] element is used to provide a unique alias for the domain service's class name.
 
 This value is used internally to generate a string representation of an service identity (the `Oid`).
 This can appear in several contexts, including:
@@ -22,7 +22,7 @@ For example:
 [source,java]
 ----
 @DomainService(
-    objectType="orders.OrderMenu"
+    logicalTypeName="orders.OrderMenu"
 )
 public class OrderMenu {
     ...
@@ -33,7 +33,7 @@ public class OrderMenu {
 
 The rules of precedence are:
 
-1. `@DomainService#objectType`
+1. `@DomainService#logicalTypeName`
 2. xref:refguide:applib-methods:ui-hints.adoc#getId[getId()]
 3. The fully qualified class name.
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/domain/DomainObjectList.adoc b/antora/components/refguide-index/modules/applib/pages/index/domain/DomainObjectList.adoc
index 2339e53..cb96eb9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/domain/DomainObjectList.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/domain/DomainObjectList.adoc
@@ -15,7 +15,7 @@ Thus, the RO client then only ever needs to know how to render an object, in all
 .DomainObjectList.java
 ----
 class DomainObjectList {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   DomainObjectList()
   DomainObjectList(final String title, final String elementTypeFqcn, final String actionOwningFqcn, final String actionId, final String actionArguments)
   String title()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/id/LogicalType.adoc b/antora/components/refguide-index/modules/applib/pages/index/id/LogicalType.adoc
index 9137e8f..d5a433d 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/id/LogicalType.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/id/LogicalType.adoc
@@ -51,7 +51,7 @@ Canonical name of the corresponding class.
 <.> xref:#getLogicalTypeName__[getLogicalTypeName()]
 +
 --
-Returns the logical-type-name (unique amongst non-abstract classes), as per the _ObjectTypeFacet_ .
+Returns the logical-type-name (unique amongst non-abstract classes), as per the _LogicalTypeFacet_ .
 --
 <.> xref:#getLogicalTypeSimpleName__[getLogicalTypeSimpleName()]
 +
@@ -94,9 +94,9 @@ Canonical name of the corresponding class.
 [#getLogicalTypeName__]
 === getLogicalTypeName()
 
-Returns the logical-type-name (unique amongst non-abstract classes), as per the _ObjectTypeFacet_ .
+Returns the logical-type-name (unique amongst non-abstract classes), as per the _LogicalTypeFacet_ .
 
-This will typically be the value of the _DomainObject#objectType()_ annotation attribute. If none has been specified then will default to the fully qualified class name (with _ClassSubstitutorRegistry class name substituted_ if necessary to allow for runtime bytecode enhancement.
+This will typically be the value of the _DomainObject#logicalTypeName()_ annotation attribute. If none has been specified then will default to the fully qualified class name (with _ClassSubstitutorRegistry class name substituted_ if necessary to allow for runtime bytecode enhancement.
 
 The _ObjectSpecification_ can be retrieved using _SpecificationLoader#specForLogicalTypeName(String)_ } passing the logical-type-name as argument.
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
index b96f5c3..84e2ff8 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/ServiceActionLayoutData.adoc
@@ -10,9 +10,9 @@ Describes the layout of a single action, broadly corresponding to _org.apache.is
 ----
 class ServiceActionLayoutData {
   ServiceActionLayoutData()
-  ServiceActionLayoutData(final String objectType, final String id)
-  String getObjectType()
-  void setObjectType(final String objectType)
+  ServiceActionLayoutData(final String logicalTypeName, final String id)
+  String getLogicalTypeName()
+  void setLogicalTypeName(final String logicalTypeName)
   String getId()     // <.>
   void setId(String id)
   BookmarkPolicy getBookmarking()
@@ -33,7 +33,7 @@ class ServiceActionLayoutData {
   void setMetadataError(final String metadataError)
   Link getLink()     // <.>
   void setLink(final Link link)
-  String getObjectTypeAndId()
+  String getLogicalTypeNameAndId()
   String toString()
 }
 ----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc b/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_logicalTypeName.adoc
similarity index 86%
copy from antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_logicalTypeName.adoc
index e167280..f851004 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_logicalTypeName.adoc
@@ -1,16 +1,16 @@
-= Object_objectType
+= Object_logicalTypeName
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Contributes a property exposing the logical object type of the domain object, typically as specified by _DomainObject#objectType()_ .
+Contributes a property exposing the logical object type of the domain object, typically as specified by _DomainObject#logicalTypeName()_ .
 
 The object type is also accessible from the _org.apache.isis.applib.services.bookmark.Bookmark_ of the object.
 
 == API
 
 [source,java]
-.Object_objectType.java
+.Object_logicalTypeName.java
 ----
-class Object_objectType {
+class Object_logicalTypeName {
   String prop()
   boolean hideProp()
 }
diff --git a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc b/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc
index 5c1a91e..3c39613 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectIdentifier.adoc
@@ -1,7 +1,7 @@
 = Object_objectIdentifier
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Contributes a property exposing the internal identifier of the domain object, typically as specified by _DomainObject#objectType()_ .
+Contributes a property exposing the internal identifier of the domain object, typically as specified by _DomainObject#logicalTypeName()_ .
 
 The object identifier is also accessible from the _org.apache.isis.applib.services.bookmark.Bookmark_ of the object.
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/mixins/system/DomainChangeRecord_openTargetObject.adoc b/antora/components/refguide-index/modules/applib/pages/index/mixins/system/DomainChangeRecord_openTargetObject.adoc
index 0f7ce87..40867b9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/mixins/system/DomainChangeRecord_openTargetObject.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/mixins/system/DomainChangeRecord_openTargetObject.adoc
@@ -9,9 +9,9 @@ Provides the ability to navigate to a domain object from a xref:refguide:applib:
 .DomainChangeRecord_openTargetObject.java
 ----
 class DomainChangeRecord_openTargetObject {
-  Object openTargetObject()
-  boolean hideOpenTargetObject()
-  String disableOpenTargetObject()
+  Object act()
+  boolean hideAct()
+  String disableAct()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/ApplicationFeatureId.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/ApplicationFeatureId.adoc
index efa775f..088fec3 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/ApplicationFeatureId.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeat/ApplicationFeatureId.adoc
@@ -3,7 +3,11 @@
 
 Value type representing a namespace, type or member.
 
-This value is _Comparable_ , the implementation of which considers _#getSort() (feature) sort_ , _#getNamespace() namespace_ , _#getTypeSimpleName() type simple name_ and _#getMemberName() member name_ .
+This value is _Comparable_ , the implementation of which considers _#getSort() (feature) sort_ , _#getNamespace() namespace_ , _#getTypeSimpleName() type simple name_ and _#getLogicalMemberName() member-logical-name_ .
+
+If the represented member is an _action_ , then _#getLogicalMemberName() member-logical-name_ must *not* include any parameter list or parentheses. Consequently method overloading is not supported.
+
+If there is a member name clash involving an _action_ and an _association_ , then consequently any permissions defined automatically apply to both and one cannot separate these.
 
 == API
 
@@ -17,7 +21,7 @@ class ApplicationFeatureId {
   ApplicationFeatureId newFeature(final String namespace, final String logicalTypeSimpleName, final String memberName)
   ApplicationFeatureId newNamespace(final String namespace)
   ApplicationFeatureId newType(final String logicalTypeName)
-  ApplicationFeatureId newMember(final String logicalTypeName, final String memberName)
+  ApplicationFeatureId newMember(final String logicalTypeName, final String memberLogicalName)
   ApplicationFeatureId newMember(String fullyQualifiedName)
   String title()     // <.>
   ApplicationFeatureId getParentTypeFeatureId()     // <.>
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureMenu.adoc
similarity index 69%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureMenu.adoc
index 562719d..995e026 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureMenu.adoc
@@ -1,15 +1,19 @@
-= MeService
+= ApplicationFeatureMenu
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.MeService.java
+.ApplicationFeatureMenu.java
 ----
-class MeService {
-  public static final String OBJECT_TYPE;
+class ApplicationFeatureMenu {
+  public static final String LOGICAL_TYPE_NAME;
   String iconName()
-  ApplicationUser me()
+  List<ApplicationNamespace> allNamespaces()
+  List<ApplicationType> allTypes()
+  List<ApplicationTypeAction> allActions()
+  List<ApplicationTypeProperty> allProperties()
+  List<ApplicationTypeCollection> allCollections()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureViewModel.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureViewModel.adoc
new file mode 100644
index 0000000..5bcc36d
--- /dev/null
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationFeatureViewModel.adoc
@@ -0,0 +1,68 @@
+= ApplicationFeatureViewModel
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+View model identified by xref:refguide:applib:index/services/appfeat/ApplicationFeatureId.adoc[ApplicationFeatureId] and backed by an xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
+
+== API
+
+[source,java]
+.ApplicationFeatureViewModel.java
+----
+class ApplicationFeatureViewModel {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationFeatureViewModel()
+  ApplicationFeatureViewModel(final ApplicationFeatureId featureId)
+  ApplicationFeatureViewModel newViewModel(final ApplicationFeatureId featureId, final ApplicationFeatureRepository applicationFeatureRepository, final FactoryService factoryService)
+  String title()     // <.>
+  String iconName()
+  String viewModelMemento()
+  void viewModelInit(final String encodedMemento)
+  ApplicationFeature getFeature()
+  String getFullyQualifiedName()
+  ApplicationFeatureSort getSort()
+  String getNamespaceName()
+  String getTypeSimpleName()
+  boolean hideTypeSimpleName()
+  String getMemberName()     // <.>
+  boolean hideMemberName()
+  ApplicationFeatureViewModel getParent()
+  ApplicationFeatureViewModel getParentNamespace()     // <.>
+  boolean equals(final Object obj)
+  int hashCode()
+  String toString()
+  Function<ApplicationFeatureId, T> factory(final ApplicationFeatureRepository featureRepository, final FactoryService factory, final Class<T> viewModelType)
+}
+----
+
+<.> xref:#title__[title()]
++
+--
+having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
+--
+<.> xref:#getMemberName__[getMemberName()]
++
+--
+For packages and class names, will be null.
+--
+<.> xref:#getParentNamespace__[getParentNamespace()]
++
+--
+The parent package feature of this class or package.
+--
+
+== Members
+
+[#title__]
+=== title()
+
+having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
+
+[#getMemberName__]
+=== getMemberName()
+
+For packages and class names, will be null.
+
+[#getParentNamespace__]
+=== getParentNamespace()
+
+The parent package feature of this class or package.
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationNamespace.adoc
similarity index 73%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationNamespace.adoc
index 4ac2e25..16402e7 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationNamespace.adoc
@@ -1,13 +1,17 @@
-= IsisModuleExtSecmanApi
+= ApplicationNamespace
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleExtSecmanApi.java
+.ApplicationNamespace.java
 ----
-class IsisModuleExtSecmanApi {
-  public static final String NAMESPACE;
+class ApplicationNamespace {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationNamespace()
+  ApplicationNamespace(final ApplicationFeatureId featureId)
+  List<ApplicationFeatureViewModel> getContents()
+  boolean hideContents()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationType.adoc
similarity index 70%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationType.adoc
index 4ac2e25..20a447c 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationType.adoc
@@ -1,13 +1,18 @@
-= IsisModuleExtSecmanApi
+= ApplicationType
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleExtSecmanApi.java
+.ApplicationType.java
 ----
-class IsisModuleExtSecmanApi {
-  public static final String NAMESPACE;
+class ApplicationType {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationType()
+  ApplicationType(final ApplicationFeatureId featureId)
+  List<ApplicationTypeAction> getActions()
+  List<ApplicationTypeProperty> getProperties()
+  List<ApplicationTypeCollection> getCollections()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeAction.adoc
similarity index 74%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeAction.adoc
index 4ac2e25..81b7f4b 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeAction.adoc
@@ -1,13 +1,17 @@
-= IsisModuleExtSecmanApi
+= ApplicationTypeAction
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleExtSecmanApi.java
+.ApplicationTypeAction.java
 ----
-class IsisModuleExtSecmanApi {
-  public static final String NAMESPACE;
+class ApplicationTypeAction {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationTypeAction()
+  ApplicationTypeAction(final ApplicationFeatureId featureId)
+  String getReturnType()
+  SemanticsOf getActionSemantics()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeCollection.adoc
similarity index 73%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeCollection.adoc
index 461b5eb..e195ca2 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeCollection.adoc
@@ -1,14 +1,17 @@
-= PasswordEncryptionService _(interface)_
+= ApplicationTypeCollection
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.PasswordEncryptionService.java
+.ApplicationTypeCollection.java
 ----
-interface PasswordEncryptionService {
-  String encrypt(final String password)
-  boolean matches(final String candidate, final String encrypted)
+class ApplicationTypeCollection {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationTypeCollection()
+  ApplicationTypeCollection(final ApplicationFeatureId featureId)
+  String getElementType()
+  boolean isDerived()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeMember.adoc
similarity index 78%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmService.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeMember.adoc
index f863df4..5701fe5 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeMember.adoc
@@ -1,13 +1,15 @@
-= SecurityRealmService _(interface)_
+= ApplicationTypeMember
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.SecurityRealmService.java
+.ApplicationTypeMember.java
 ----
-interface SecurityRealmService {
-  SecurityRealm getCurrentRealm()
+class ApplicationTypeMember {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationTypeMember(final ApplicationFeatureId featureId)
+  String getMemberName()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeProperty.adoc
similarity index 67%
copy from antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeProperty.adoc
index 2c15eaa..a34e677 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/IsisModuleApplib.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/appfeatui/ApplicationTypeProperty.adoc
@@ -1,17 +1,21 @@
-= IsisModuleApplib
+= ApplicationTypeProperty
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleApplib.java
+.ApplicationTypeProperty.java
 ----
-class IsisModuleApplib {
-  public static final String NAMESPACE;
-  // for configuration; to minimize the risk of granting perms accidentally
-public static final String NAMESPACE_CONF;
-  // for configuration; to minimize the risk of granting perms accidentally
-public static final String NAMESPACE_SUDO;
+class ApplicationTypeProperty {
+  public static final String LOGICAL_TYPE_NAME;
+  ApplicationTypeProperty()
+  ApplicationTypeProperty(final ApplicationFeatureId featureId)
+  String getReturnType()
+  boolean isDerived()
+  Integer getMaxLength()
+  boolean hideMaxLength()
+  Integer getTypicalLength()
+  boolean hideTypicalLength()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/BookmarkService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
index ffe6f16..43e0aab 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/BookmarkService.adoc
@@ -10,7 +10,7 @@ This service provides a serializable 'bookmark' for any entity, and conversely t
 ----
 interface BookmarkService {
   Optional<Bookmark> bookmarkFor(Object domainObject)     // <.>
-  Optional<Bookmark> bookmarkFor(Class<?> cls, String identifier)     // <.>
+  Optional<Bookmark> bookmarkFor(Class<?> type, String identifier)     // <.>
   Optional<Object> lookup(BookmarkHolder bookmarkHolder)     // <.>
   Optional<Object> lookup(Bookmark bookmark)     // <.>
   Optional<T> lookup(Bookmark bookmark, Class<T> cls)     // <.>
@@ -59,6 +59,8 @@ Optionally returns the xref:refguide:applib:index/services/bookmark/Bookmark.ado
 
 Optionally returns a xref:refguide:applib:index/services/bookmark/Bookmark.adoc[Bookmark] created from the constituent parts, based on whether can create a bookmark from these.
 
+With constituent parts a _type_ and an _identifier_ that uniquely identifies an instance of this type.
+
 [#lookup__BookmarkHolder]
 === lookup(BookmarkHolder)
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/Oid.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/Oid.adoc
index 25d4ecb..1477467 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/Oid.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/Oid.adoc
@@ -28,6 +28,13 @@ Stringified version of the ID of the domain object instance this Oid is represen
 <.> xref:#getObjectType__[getObjectType()]
 +
 --
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#getLogicalTypeName()_
+====
+
 Alias for _#getLogicalTypeName()_ .
 --
 <.> xref:#stringify__[stringify()]
@@ -51,6 +58,13 @@ Stringified version of the ID of the domain object instance this Oid is represen
 [#getObjectType__]
 === getObjectType()
 
+[WARNING]
+====
+[red]#_deprecated:_#
+
+use _#getLogicalTypeName()_
+====
+
 Alias for _#getLogicalTypeName()_ .
 
 [#stringify__]
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
index f677e71..146e418 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/bookmark/hooks/BookmarkService_020-examples-and-usage.adoc
@@ -19,7 +19,7 @@ Either of these can be suppressed, if required, using a xref:userguide:btb:hints
 
 == Examples
 
-For example, a `Customer` object with an xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[object type] of "custmgmt.Customer" and an id of 123 would correspond to a xref:BookmarkService.adoc#bookmark[Bookmark] with a string representation of "custmgmt.Customer|123".
+For example, a `Customer` object with an xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical type name] of "custmgmt.Customer" and an id of 123 would correspond to a xref:BookmarkService.adoc#bookmark[Bookmark] with a string representation of "custmgmt.Customer|123".
 
 Bookmarks are useful to store a reference to an arbitrary object, although be aware that there is no referential integrity.
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
index 04eccdb..41f77cb 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationMenu.adoc
@@ -9,7 +9,7 @@ Simply provides a UI in order to access the configuration properties available f
 .ConfigurationMenu.java
 ----
 class ConfigurationMenu {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   ConfigurationMenu(FactoryService factoryService)
   ConfigurationViewmodel configuration()
 }
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc
index 6d75c96..f8f2386 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/confview/ConfigurationProperty.adoc
@@ -7,7 +7,7 @@
 .ConfigurationProperty.java
 ----
 class ConfigurationProperty {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   ConfigurationProperty(final String key, final String value)
   int compareTo(final ConfigurationProperty other)
 }
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
index 58f155a..5d0414c 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/layout/LayoutServiceMenu.adoc
@@ -9,7 +9,7 @@ Simply provides a UI to allow layouts (obtained from xref:refguide:applib:index/
 .LayoutServiceMenu.java
 ----
 class LayoutServiceMenu {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   LayoutServiceMenu()
   Blob downloadLayouts(final Style style)
   Style default0DownloadLayouts()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
index 3391e74..4809a92 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelService.adoc
@@ -9,7 +9,7 @@ This service provides a formal API into the framework's metamodel.
 .MetaModelService.java
 ----
 interface MetaModelService {
-  Optional<LogicalType> lookupLogicalTypeByName(final String objectType)     // <.>
+  Optional<LogicalType> lookupLogicalTypeByName(final String logicalTypeName)     // <.>
   Optional<LogicalType> lookupLogicalTypeByClass(final Class<?> domainType)     // <.>
   void rebuild(final Class<?> domainType)     // <.>
   DomainModel getDomainModel()     // <.>
@@ -23,12 +23,12 @@ interface MetaModelService {
 <.> xref:#lookupLogicalTypeByName__String[lookupLogicalTypeByName(String)]
 +
 --
-Provides a lookup by objectType of a domain class' object type, as defined by _DomainObject#objectType()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ). Will return an empty result if there is no such non-abstract class registered. (interfaces and abstract types are never added to the lookup table).
+Provides a lookup by logicalTypeName of a domain class' object type, as defined by _DomainObject#logicalTypeName()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ). Will return an empty result if there is no such non-abstract class registered. (interfaces and abstract types are never added to the lookup table).
 --
 <.> xref:#lookupLogicalTypeByClass__Class[lookupLogicalTypeByClass(Class)]
 +
 --
-Provides a lookup by class of a domain class' object type, as defined by _DomainObject#objectType()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ).
+Provides a lookup by class of a domain class' object type, as defined by _DomainObject#logicalTypeName()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ).
 --
 <.> xref:#rebuild__Class[rebuild(Class)]
 +
@@ -66,12 +66,12 @@ Exports the entire metamodel as a DTO, serializable into XML using JAXB.
 [#lookupLogicalTypeByName__String]
 === lookupLogicalTypeByName(String)
 
-Provides a lookup by objectType of a domain class' object type, as defined by _DomainObject#objectType()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ). Will return an empty result if there is no such non-abstract class registered. (interfaces and abstract types are never added to the lookup table).
+Provides a lookup by logicalTypeName of a domain class' object type, as defined by _DomainObject#logicalTypeName()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ). Will return an empty result if there is no such non-abstract class registered. (interfaces and abstract types are never added to the lookup table).
 
 [#lookupLogicalTypeByClass__Class]
 === lookupLogicalTypeByClass(Class)
 
-Provides a lookup by class of a domain class' object type, as defined by _DomainObject#objectType()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ).
+Provides a lookup by class of a domain class' object type, as defined by _DomainObject#logicalTypeName()_ (or any other mechanism that corresponds to Isis' `ObjectTypeFacet` ).
 
 [#rebuild__Class]
 === rebuild(Class)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
index 968dd1f..5e46d24 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/metamodel/MetaModelServiceMenu.adoc
@@ -9,7 +9,7 @@ Provides a UI to allow domain model metadata (obtained from xref:refguide:applib
 .MetaModelServiceMenu.java
 ----
 class MetaModelServiceMenu {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   MetaModelServiceMenu()
   Clob downloadMetaModelCsv(final String csvFileName)
   String default0DownloadMetaModelCsv()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/user/ImpersonateMenu.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/user/ImpersonateMenu.adoc
index 73cc7dc..4c96e52 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/user/ImpersonateMenu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/user/ImpersonateMenu.adoc
@@ -12,18 +12,16 @@ All of the actions provided here are restricted to PROTOTYPE mode only; this fea
 ----
 class ImpersonateMenu {
   // deliberately not part of isis.applib
-public static final String OBJECT_TYPE;
+public static final String LOGICAL_TYPE_NAME;
   void impersonate(final String userName)     // <.>
   boolean hideImpersonate()
   String disableImpersonate()
-  void impersonateWithRoles(final String userName, final boolean useUsersRoles, final List<String> roleNames)     // <.>
+  void impersonateWithRoles(final String userName, final List<String> roleNames)     // <.>
   boolean hideImpersonateWithRoles()
   String disableImpersonateWithRoles()
   List<String> choices0ImpersonateWithRoles()
-  boolean default1ImpersonateWithRoles()
-  boolean hide2ImpersonateWithRoles(final String userName, boolean useUsersRoles)
-  List<String> choices2ImpersonateWithRoles(final String userName, boolean useUsersRoles)
-  List<String> default2ImpersonateWithRoles(final String userName, boolean useUsersRoles)
+  List<String> choices1ImpersonateWithRoles(final String userName)
+  List<String> default1ImpersonateWithRoles(final String userName)
   void stopImpersonating()
   boolean hideStopImpersonating()
   String disableStopImpersonating()
@@ -35,7 +33,7 @@ public static final String OBJECT_TYPE;
 --
 Simple implementation that is surfaced if there is no advisor.
 --
-<.> xref:#impersonateWithRoles__String_boolean_List[impersonateWithRoles(String, boolean, List)]
+<.> xref:#impersonateWithRoles__String_List[impersonateWithRoles(String, List)]
 +
 --
 Impersonate a selected user, either using their current roles or with a specific set of roles.
@@ -48,8 +46,8 @@ Impersonate a selected user, either using their current roles or with a specific
 
 Simple implementation that is surfaced if there is no advisor.
 
-[#impersonateWithRoles__String_boolean_List]
-=== impersonateWithRoles(String, boolean, List)
+[#impersonateWithRoles__String_List]
+=== impersonateWithRoles(String, List)
 
 Impersonate a selected user, either using their current roles or with a specific set of roles.
 
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/user/RoleMemento.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/user/RoleMemento.adoc
index 3e4bab5..d19f526 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/user/RoleMemento.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/user/RoleMemento.adoc
@@ -9,7 +9,7 @@ Immutable serializable value held by xref:refguide:applib:index/services/user/Us
 .RoleMemento.java
 ----
 class RoleMemento {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   RoleMemento(final String name)     // <.>
   RoleMemento(final String name, final String description)     // <.>
   String title()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/user/UserMemento.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/user/UserMemento.adoc
index 3174973..502f872 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/user/UserMemento.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/user/UserMemento.adoc
@@ -9,7 +9,7 @@ Immutable serializable value holding details about a user and its roles.
 .UserMemento.java
 ----
 class UserMemento {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   UserMemento(final String name, final Stream<RoleMemento> roles)     // <.>
   UserMemento system()     // <.>
   UserMemento ofName(final String name)     // <.>
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
index e32007b..a34c582 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/wrapper/events/InteractionEvent.adoc
@@ -51,7 +51,7 @@ Convenience method that returns the _Identifier#getClassNaturalName() natural cl
 <.> xref:#getMemberName__[getMemberName()]
 +
 --
-Convenience method that returns the _Identifier#getMemberName() member name_ of the _#getIdentifier() identifier_ .
+Convenience method that returns the _Identifier#getMemberLogicalName() member name_ of the _#getIdentifier() identifier_ .
 --
 <.> xref:#getMemberNaturalName__[getMemberNaturalName()]
 +
@@ -121,7 +121,7 @@ Convenience method that returns the _Identifier#getClassNaturalName() natural cl
 [#getMemberName__]
 === getMemberName()
 
-Convenience method that returns the _Identifier#getMemberName() member name_ of the _#getIdentifier() identifier_ .
+Convenience method that returns the _Identifier#getMemberLogicalName() member name_ of the _#getIdentifier() identifier_ .
 
 [#getMemberNaturalName__]
 === getMemberNaturalName()
diff --git a/antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizationManager.adoc b/antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizationManager.adoc
new file mode 100644
index 0000000..6f5346a
--- /dev/null
+++ b/antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizationManager.adoc
@@ -0,0 +1,43 @@
+= AuthorizationManager
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+Authorizes the user in the current session view and use members of an object.
+
+== API
+
+[source,java]
+.AuthorizationManager.java
+----
+class AuthorizationManager {
+  AuthorizationManager(final List<Authorizor> authorizors, final AuthorizorChooser authorizorChooser)
+  boolean isUsable(final Authentication authentication, final Identifier identifier)     // <.>
+  boolean isVisible(final Authentication authentication, final Identifier identifier)     // <.>
+}
+----
+
+<.> xref:#isUsable__Authentication_Identifier[isUsable(Authentication, Identifier)]
++
+--
+Whether the user represented by the specified session is authorized to view the member of the class/object represented by the member identifier.
+--
+<.> xref:#isVisible__Authentication_Identifier[isVisible(Authentication, Identifier)]
++
+--
+Whether the user represented by the specified session is authorized to change the field represented by the member identifier.
+--
+
+== Members
+
+[#isUsable__Authentication_Identifier]
+=== isUsable(Authentication, Identifier)
+
+Whether the user represented by the specified session is authorized to view the member of the class/object represented by the member identifier.
+
+Normally the view of the specified field, or the display of the action will be suppress if this returns false.
+
+[#isVisible__Authentication_Identifier]
+=== isVisible(Authentication, Identifier)
+
+Whether the user represented by the specified session is authorized to change the field represented by the member identifier.
+
+Normally the specified field will be not appear editable if this returns false.
diff --git a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc b/antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizorChooser.adoc
similarity index 65%
rename from antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
rename to antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizorChooser.adoc
index e167280..bfc8153 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/mixins/metamodel/Object_objectType.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/security/authorization/manager/AuthorizorChooser.adoc
@@ -1,18 +1,21 @@
-= Object_objectType
+= AuthorizorChooser _(interface)_
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Contributes a property exposing the logical object type of the domain object, typically as specified by _DomainObject#objectType()_ .
-
-The object type is also accessible from the _org.apache.isis.applib.services.bookmark.Bookmark_ of the object.
+Provides an SPI to select from multiple xref:refguide:core:index/security/authorization/Authorizor.adoc[Authorizor] s if more than one are present on the classpath.
 
 == API
 
 [source,java]
-.Object_objectType.java
+.AuthorizorChooser.java
 ----
-class Object_objectType {
-  String prop()
-  boolean hideProp()
+interface AuthorizorChooser {
+  Authorizor chooseFrom(final List<Authorizor> authorizors)     // <.>
 }
 ----
 
+<.> xref:#chooseFrom__List[chooseFrom(List)]
+
+== Members
+
+[#chooseFrom__List]
+=== chooseFrom(List)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc
index af35a63..2d79b28 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandlog/jdo/ui/CommandServiceMenu.adoc
@@ -7,7 +7,7 @@
 .CommandServiceMenu.java
 ----
 class CommandServiceMenu {
-  public final static String OBJECT_TYPE;
+  public final static String LOGICAL_TYPE_NAME;
   List<CommandJdo> activeCommands()
   boolean hideActiveCommands()
   List<CommandJdo> findCommands(final LocalDate from, final LocalDate to)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
index 0efb0dc..689b0ec 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/restapi/CommandRetrievalService.adoc
@@ -7,7 +7,7 @@
 .CommandRetrievalService.java
 ----
 class CommandRetrievalService {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   List<? extends CommandModel> findCommandsOnPrimaryFrom(final UUID interactionId, final Integer batchSize)     // <.>
   Integer default1FindCommandsOnPrimaryFrom()
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
index be3c895..53e06ef 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/primary/ui/CommandReplayOnPrimaryService.adoc
@@ -7,7 +7,7 @@
 .CommandReplayOnPrimaryService.java
 ----
 class CommandReplayOnPrimaryService {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   List<? extends CommandModel> findCommands(final UUID interactionId, final Integer batchSize)     // <.>
   Integer default1FindCommandsOnPrimaryFrom()
   Clob downloadCommands(final UUID interactionId, final Integer batchSize, final String filenamePrefix)     // <.>
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
index 5c31ca5..3dab90a 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/commandreplay/secondary/ui/CommandReplayOnSecondaryService.adoc
@@ -7,7 +7,7 @@
 .CommandReplayOnSecondaryService.java
 ----
 class CommandReplayOnSecondaryService {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   CommandModel findMostRecentReplayed()
   void uploadCommands(final Clob commandsDtoAsXml)
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc b/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
index 8934901..da5aca6 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/hsqldbmgr/dom/services/HsqlDbManagerMenu.adoc
@@ -7,7 +7,7 @@
 .HsqlDbManagerMenu.java
 ----
 class HsqlDbManagerMenu {
-  public final static String OBJECT_TYPE;
+  public final static String LOGICAL_TYPE_NAME;
   HsqlDbManagerMenu(DataSourceIntrospectionService datasourceIntrospector)
   void hsqlDbManager()
   boolean hideHsqlDbManager()
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmCharacteristic.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmCharacteristic.adoc
deleted file mode 100644
index c7734e6..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealmCharacteristic.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= SecurityRealmCharacteristic _(enum)_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.SecurityRealmCharacteristic.java
-----
-enum SecurityRealmCharacteristic {
-  DELEGATING
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionServiceNone.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionServiceNone.adoc
deleted file mode 100644
index e0637aa..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionServiceNone.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-= PasswordEncryptionServiceNone
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.PasswordEncryptionServiceNone.java
-----
-class PasswordEncryptionServiceNone {
-  String encrypt(String password)
-  boolean matches(String candidate, String encrypted)
-}
-----
-
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermission.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermission.adoc
deleted file mode 100644
index 8a26afe..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermission.adoc
+++ /dev/null
@@ -1,67 +0,0 @@
-= ApplicationPermission _(interface)_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-Specifies how a particular _#getRole() application role_ may interact with a specific xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
-
-Each permission has a _#getRule() rule_ and a _#getMode() mode_ . The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] determines whether the permission _ApplicationPermissionRule#ALLOW grants_ access to the feature or _ApplicationPermissionRule#VETO veto_ es access to it. The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] indicates whether the role can _A [...]
-
-For a given permission, there is an interaction between the xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] and the xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] :
-
-* for an _ApplicationPermissionRule#ALLOW allow_ , a _ApplicationPermissionMode#CHANGING usability_ allow implies _ApplicationPermissionMode#VIEWING visibility_ allow.
-* conversely, for a _ApplicationPermissionRule#VETO veto_ , a _ApplicationPermissionMode#VIEWING visibility_ veto implies a _ApplicationPermissionMode#CHANGING usability_ veto.
-
-== API
-
-[source,java]
-.ApplicationPermission.java
-----
-interface ApplicationPermission {
-  String OBJECT_TYPE;
-  String NAMED_QUERY_FIND_BY_FEATURE;
-  String NAMED_QUERY_FIND_BY_ROLE;
-  String NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE;
-  String NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE_FQN;
-  String NAMED_QUERY_FIND_BY_USER;
-  String title()     // <.>
-  ApplicationRole getRole()
-  void setRole(ApplicationRole applicationRole)
-  ApplicationPermissionRule getRule()
-  void setRule(ApplicationPermissionRule rule)
-  ApplicationPermissionMode getMode()
-  void setMode(ApplicationPermissionMode changing)
-  String getSort()
-  ApplicationFeatureSort getFeatureSort()     // <.>
-  void setFeatureSort(ApplicationFeatureSort featureSort)
-  String getFeatureFqn()
-  void setFeatureFqn(String featureFqn)
-  ApplicationFeature findFeature(ApplicationFeatureId featureId)
-  Optional<ApplicationMemberSort> getMemberSort()
-  Optional<ApplicationFeature> getFeature()
-  Optional<ApplicationFeatureId> asFeatureId()
-}
-----
-
-<.> xref:#title__[title()]
-+
---
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
---
-<.> xref:#getFeatureSort__[getFeatureSort()]
-+
---
-Which _ApplicationFeatureId#getSort() sort_ of feature this is.
---
-
-== Members
-
-[#title__]
-=== title()
-
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
-
-[#getFeatureSort__]
-=== getFeatureSort()
-
-Which _ApplicationFeatureId#getSort() sort_ of feature this is.
-
-The combination of the feature type and the _#getFeatureFqn() fully qualified name_ is used to build the corresponding _#getFeature() feature_ (view model).
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/role/dom/ApplicationRole.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/role/dom/ApplicationRole.adoc
deleted file mode 100644
index d46b3aa..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/role/dom/ApplicationRole.adoc
+++ /dev/null
@@ -1,34 +0,0 @@
-= ApplicationRole _(interface)_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.ApplicationRole.java
-----
-interface ApplicationRole {
-  String OBJECT_TYPE;
-  String NAMED_QUERY_FIND_BY_NAME;
-  String NAMED_QUERY_FIND_BY_NAME_CONTAINING;
-  String title()     // <.>
-  String getName()
-  void setName(String name)
-  String getDescription()
-  void setDescription(String description)
-  Set<ApplicationUser> getUsers()
-  List<ApplicationPermission> getPermissions()
-}
-----
-
-<.> xref:#title__[title()]
-+
---
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
---
-
-== Members
-
-[#title__]
-=== title()
-
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUser.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUser.adoc
deleted file mode 100644
index cb880c5..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUser.adoc
+++ /dev/null
@@ -1,62 +0,0 @@
-= ApplicationUser _(interface)_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.ApplicationUser.java
-----
-interface ApplicationUser {
-  String OBJECT_TYPE;
-  String NAMED_QUERY_FIND_BY_USERNAME;
-  String NAMED_QUERY_FIND_BY_EMAIL_ADDRESS;
-  String NAMED_QUERY_FIND;
-  String NAMED_QUERY_FIND_BY_ATPATH;
-  String title()     // <.>
-  String iconName()
-  String getName()
-  String getUsername()
-  void setUsername(String username)
-  String getFamilyName()
-  void setFamilyName(String familyName)
-  String getGivenName()
-  void setGivenName(String givenName)
-  String getKnownAs()
-  void setKnownAs(String knownAs)
-  String getEmailAddress()
-  void setEmailAddress(String emailAddress)
-  String getPhoneNumber()
-  void setPhoneNumber(String phoneNumber)
-  String getFaxNumber()
-  void setFaxNumber(String faxNumber)
-  String getAtPath()
-  void setAtPath(String atPath)
-  org.apache.isis.extensions.secman.applib.user.dom.AccountType getAccountType()
-  void setAccountType(org.apache.isis.extensions.secman.applib.user.dom.AccountType accountType)
-  ApplicationUserStatus getStatus()
-  void setStatus(ApplicationUserStatus disabled)
-  String getEncryptedPassword()
-  void setEncryptedPassword(String encryptedPassword)
-  boolean isHasPassword()
-  boolean hideHasPassword()
-  Set<ApplicationRole> getRoles()
-  ApplicationPermissionValueSet getPermissionSet()
-  boolean isForSelfOrRunAsAdministrator()
-  String getAdminRoleName()
-  UserMemento currentUser()
-  boolean isLocalAccount()
-}
-----
-
-<.> xref:#title__[title()]
-+
---
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
---
-
-== Members
-
-[#title__]
-=== title()
-
-having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/IsisModuleExtSecmanApplib.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/IsisModuleExtSecmanApplib.adoc
index 4ac2e25..bf08931 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/IsisModuleExtSecmanApi.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/IsisModuleExtSecmanApplib.adoc
@@ -1,12 +1,12 @@
-= IsisModuleExtSecmanApi
+= IsisModuleExtSecmanApplib
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleExtSecmanApi.java
+.IsisModuleExtSecmanApplib.java
 ----
-class IsisModuleExtSecmanApi {
+class IsisModuleExtSecmanApplib {
   public static final String NAMESPACE;
 }
 ----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecmanConfiguration.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc
similarity index 92%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecmanConfiguration.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc
index fd9c453..b25718a 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecmanConfiguration.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/SecmanConfiguration.adoc
@@ -13,6 +13,8 @@ This class is implemented as a builder (courtesy of Lombok) but it provides reas
 .SecmanConfiguration.java
 ----
 class SecmanConfiguration {
+  public static String ADMIN_ROLE_DEFAULT_NAME;
+  public static String REGULAR_USER_ROLE_DEFAULT_NAME;
   Stream<String> streamAdminNamespacePermissions()
   boolean isStickyAdminNamespace(String featureFqn)
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermission.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermission.adoc
new file mode 100644
index 0000000..053624f
--- /dev/null
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermission.adoc
@@ -0,0 +1,35 @@
+= ApplicationPermission
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+Specifies how a particular _#getRole() application role_ may interact with a specific xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
+
+Each permission has a _#getRule() rule_ and a _#getMode() mode_ . The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] determines whether the permission _ApplicationPermissionRule#ALLOW grants_ access to the feature or _ApplicationPermissionRule#VETO veto_ es access to it. The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] indicates whether the role  [...]
+
+For a given permission, there is an interaction between the xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] and the xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] :
+
+* for an _ApplicationPermissionRule#ALLOW allow_ , a _ApplicationPermissionMode#CHANGING usability_ allow implies _ApplicationPermissionMode#VIEWING visibility_ allow.
+* conversely, for a _ApplicationPermissionRule#VETO veto_ , a _ApplicationPermissionMode#VIEWING visibility_ veto implies a _ApplicationPermissionMode#CHANGING usability_ veto.
+
+== API
+
+[source,java]
+.ApplicationPermission.java
+----
+class ApplicationPermission {
+  public static final String LOGICAL_TYPE_NAME;
+  public static final String NAMED_QUERY_FIND_BY_FEATURE;
+  public static final String NAMED_QUERY_FIND_BY_ROLE;
+  public static final String NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE;
+  public static final String NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE_FQN;
+  public static final String NAMED_QUERY_FIND_BY_USER;
+  String title()
+  String getSort()
+  ApplicationFeature findFeature(ApplicationFeatureId featureId)
+  Optional<ApplicationFeatureId> asFeatureId()
+  int compareTo(final org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission other)
+  boolean equals(final Object other)
+  int hashCode()
+  String toString()
+}
+----
+
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionMode.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionMode.adoc
similarity index 77%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionMode.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionMode.adoc
index da4a5e1..29a79b3 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionMode.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionMode.adoc
@@ -33,7 +33,7 @@ Whether can user/role can change (or is prevented from changing) the state of th
 
 Whether the user/role can view (or is prevented from viewing) the application feature (class member).
 
-The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
+The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
 
 [#CHANGING]
 === CHANGING
@@ -42,6 +42,6 @@ Whether can user/role can change (or is prevented from changing) the state of th
 
 In other words, whether they can execute (if an action, modify/clear (if a property), addTo/removeFrom (if a collection).
 
-The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
+The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionRule.adoc[ApplicationPermissionRule] of the xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission] indicates whether access is being granted or denied.
 
 Note that the Wicket viewer does not at the time of writing (Isis 1.6.0) support the notion of mutable collections. The RO viewer does, however.
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRepository.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRepository.adoc
similarity index 95%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRepository.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRepository.adoc
index 4a55b79..a956ee9 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRepository.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRepository.adoc
@@ -18,6 +18,8 @@ interface ApplicationPermissionRepository {
   ApplicationPermission newPermission(ApplicationRole role, ApplicationPermissionRule rule, ApplicationPermissionMode mode, ApplicationFeatureSort featureSort, String featureFqn)
   ApplicationPermission newPermission(ApplicationRole role, ApplicationPermissionRule rule, ApplicationPermissionMode mode, ApplicationFeatureId featureId)
   ApplicationPermission newPermissionNoCheck(ApplicationRole role, ApplicationPermissionRule rule, ApplicationPermissionMode mode, ApplicationFeatureSort sort, String featureFqn)     // <.>
+  List<ApplicationPermission> findByUser(ApplicationUser applicationUser)
+  List<ApplicationPermission> findByRole(ApplicationRole applicationRole)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRule.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRule.adoc
similarity index 76%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRule.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRule.adoc
index 1683b56..cee8ed8 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionRule.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionRule.adoc
@@ -33,11 +33,11 @@ The permission prevents the ability to view/use the xref:refguide:applib:index/s
 
 The permission grants the ability to view/use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
 
-The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
+The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
 
 [#VETO]
 === VETO
 
 The permission prevents the ability to view/use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
 
-The xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
+The xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode] determines whether the permission is to only view or also to use the xref:refguide:applib:index/services/appfeat/ApplicationFeature.adoc[ApplicationFeature] .
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValue.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValue.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValue.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValue.adoc
index 38b41b0..f713d36 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValue.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValue.adoc
@@ -1,7 +1,7 @@
 = ApplicationPermissionValue
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-A serializable value object representing an (anonymized) xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermission.adoc[ApplicationPermission] .
+A serializable value object representing an (anonymized) xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission] .
 
 Intended for value type arithmetic and also for caching. No user/role information is held because that information is not required to perform the arithmetic.
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValueSet.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValueSet.adoc
similarity index 92%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValueSet.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValueSet.adoc
index 404ab63..04e1297 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/dom/ApplicationPermissionValueSet.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/dom/ApplicationPermissionValueSet.adoc
@@ -1,7 +1,7 @@
 = ApplicationPermissionValueSet
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-A serializable value object representing a set of (anonymized) xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionValue.adoc[ApplicationPermissionValue] s.
+A serializable value object representing a set of (anonymized) xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionValue.adoc[ApplicationPermissionValue] s.
 
 Intended for value type arithmetic and also for caching.
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationService.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationService.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationService.adoc
index 93a4d51..446faf3 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationService.adoc
@@ -3,7 +3,7 @@
 
 Strategy for determining which permission should apply when there are multiple that apply for a particular target feature Id, and which may conflict with each other.
 
-All implementations of this interface must be _java.io.Serializable_ , because an instance is serialized into xref:refguide:extensions:index/secman/api/permission/dom/ApplicationPermissionValueSet.adoc[ApplicationPermissionValueSet] .
+All implementations of this interface must be _java.io.Serializable_ , because an instance is serialized into xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionValueSet.adoc[ApplicationPermissionValueSet] .
 
 == API
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceAbstract.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAbstract.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceAbstract.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAbstract.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceAllowBeatsVeto.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/permission/spi/PermissionsEvaluationServiceVetoBeatsAllow.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/AccountType.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/dom/ApplicationRole.adoc
similarity index 62%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/AccountType.adoc
copy to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/dom/ApplicationRole.adoc
index 60b4a6f..8f0d12f 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/AccountType.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/dom/ApplicationRole.adoc
@@ -1,18 +1,20 @@
-= AccountType _(enum)_
+= ApplicationRole
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Whether the user's account is local enabled (user/password) or delegated (eg LDAP), as per _org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanShiroRealm#setDelegateAuthenticationRealm(org.apache.shiro.realm.AuthenticatingRealm)_ .
-
 == API
 
 [source,java]
-.AccountType.java
+.ApplicationRole.java
 ----
-enum AccountType {
-  LOCAL
-  DELEGATED
-  boolean isLocal()
-  boolean isDelegated()
+class ApplicationRole {
+  public static final String LOGICAL_TYPE_NAME;
+  public static final String NAMED_QUERY_FIND_BY_NAME;
+  public static final String NAMED_QUERY_FIND_BY_NAME_CONTAINING;
+  String title()
+  List<org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission> getPermissions()
+  int compareTo(final org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole other)
+  boolean equals(final Object obj)
+  int hashCode()
   String toString()
 }
 ----
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/role/dom/ApplicationRoleRepository.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/dom/ApplicationRoleRepository.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/role/dom/ApplicationRoleRepository.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/dom/ApplicationRoleRepository.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealm.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.adoc
similarity index 80%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealm.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.adoc
index 2082066..b384876 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/SecurityRealm.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.adoc
@@ -1,13 +1,14 @@
-= SecurityRealm _(interface)_
+= IsisAppFeatureRoleAndPermissions
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.SecurityRealm.java
+.IsisAppFeatureRoleAndPermissions.java
 ----
-interface SecurityRealm {
-  EnumSet<SecurityRealmCharacteristic> getCharacteristics()
+class IsisAppFeatureRoleAndPermissions {
+  public static final String ROLE_NAME;
+  IsisAppFeatureRoleAndPermissions()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtH2ConsoleRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisExtH2ConsoleRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtH2ConsoleRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanAdminRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanAdminRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
similarity index 71%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
index 2c04385..9397879 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanRegularUserRoleAndPermissions.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisExtSecmanRegularUserRoleAndPermissions.adoc
@@ -5,9 +5,9 @@ Role for regular users of the security module.
 
 These permissions are intended to be sufficient for most regular users to have access to the 'safe' features provided by the core framework (in particular, everything under the _IsisModuleApplib#NAMESPACE isis.applib_ namespace.
 
-That said, it does _not_ include the ability to impersonate other users (for this, grant the _org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions_ role), and also does _not_ include the ability to access the configuration properties (for this, grant the _org.apache.isis.extensions.secman.model.seed.scripts.other.IsisSudoImpersonateRoleAndPermissions_ role).
+That said, it does _not_ include the ability to impersonate other users (for this, grant the xref:refguide:extensions:index/secman/applib/role/seed/IsisSudoImpersonateRoleAndPermissions.adoc[IsisSudoImpersonateRoleAndPermissions] role), and also does _not_ include the ability to access the configuration properties (for this, grant the xref:refguide:extensions:index/secman/applib/role/seed/IsisSudoImpersonateRoleAndPermissions.adoc[IsisSudoImpersonateRoleAndPermissions] role).
 
-The permissions also provide the ability to lookup their user account using the xref:refguide:extensions:index/secman/api/user/menu/MeService.adoc[MeService] , and for viewing and maintaining their user details.
+The permissions also provide the ability to lookup their user account using the xref:refguide:extensions:index/secman/applib/user/menu/MeService.adoc[MeService] , and for viewing and maintaining their user details.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisPersistenceJdoMetaModelRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisPersistenceJdoMetaModelRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisPersistenceJdoMetaModelRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisSudoImpersonateRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisSudoImpersonateRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisSudoImpersonateRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/other/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/role/seed/IsisViewerRestfulObjectsSwaggerRoleAndPermissions.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/SeedSecurityModuleService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/seed/SeedSecurityModuleService.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/SeedSecurityModuleService.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/seed/SeedSecurityModuleService.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.adoc
similarity index 72%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.adoc
index 11e7f3a..69a464d 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/seed/scripts/SeedUsersAndRolesFixtureScript.adoc
@@ -1,7 +1,7 @@
 = SeedUsersAndRolesFixtureScript
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-This fixture script will be run automatically on start-up by virtue of the fact that the xref:refguide:extensions:index/secman/model/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
+This fixture script will be run automatically on start-up by virtue of the fact that the xref:refguide:extensions:index/secman/applib/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService] is a _org.apache.isis.applib.annotation.DomainService_ and calls the setup during its _SeedSecurityModuleService#onMetamodelEvent(org.apache.isis.core.metamodel.events.MetamodelEvent) init_ ( _javax.annotation.PostConstruct_ ) method.
 
 == API
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/ApplicationTenancy.adoc
similarity index 64%
copy from antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc
copy to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/ApplicationTenancy.adoc
index f24c34f..8dd7d2b 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/ApplicationTenancy.adoc
@@ -1,4 +1,4 @@
-= ApplicationTenancy _(interface)_
+= ApplicationTenancy
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
@@ -6,19 +6,16 @@
 [source,java]
 .ApplicationTenancy.java
 ----
-interface ApplicationTenancy {
-  String OBJECT_TYPE;
-  String NAMED_QUERY_FIND_BY_NAME;
-  String NAMED_QUERY_FIND_BY_PATH;
-  String NAMED_QUERY_FIND_BY_NAME_OR_PATH_MATCHING;
+class ApplicationTenancy {
+  public static final String LOGICAL_TYPE_NAME;
+  public static final String NAMED_QUERY_FIND_BY_NAME;
+  public static final String NAMED_QUERY_FIND_BY_PATH;
+  public static final String NAMED_QUERY_FIND_BY_NAME_OR_PATH_MATCHING;
   String title()
-  String getName()
-  void setName(String name)
-  String getPath()
-  void setPath(String path)
-  ApplicationTenancy getParent()
-  void setParent(ApplicationTenancy parent)
-  Collection<ApplicationTenancy> getChildren()
+  int compareTo(final org.apache.isis.extensions.secman.applib.tenancy.dom.ApplicationTenancy other)
+  boolean equals(final Object other)
+  int hashCode()
+  String toString()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancyRepository.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/ApplicationTenancyRepository.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancyRepository.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/ApplicationTenancyRepository.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/HasAtPath.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/HasAtPath.adoc
similarity index 70%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/HasAtPath.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/HasAtPath.adoc
index a367921..28656a3 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/HasAtPath.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/dom/HasAtPath.adoc
@@ -3,11 +3,11 @@
 
 Role interface for domain objects to implement, indicating that these are characteristics of the entity that can be used to determine its visibility/editability.object's tenancyuser's tenancyaccessnullnulleditablenullnon-nulleditable//editable//itvisible//it/carvisible//it/iglvisible//frvisible/nullnot visible/it/editable/it/iteditable/it/it/carvisible/it/it/iglvisible/it/frnot visible/itnullnot visible/it/car/editable/it/car/iteditable/it/car/it/careditable/it/car/it/iglnot visible/it/c [...]
 
-Previously the `atPath` would have corresponded to the unique path of some particular xref:refguide:extensions:index/secman/api/tenancy/dom/ApplicationTenancy.adoc[ApplicationTenancy] instance. However, this has now been generalized; the atPath is simply a string whose interpretation is application-specific (in particular by the xref:refguide:extensions:index/secman/api/tenancy/spi/ApplicationTenancyEvaluator.adoc[ApplicationTenancyEvaluator] SPI).
+Previously the `atPath` would have corresponded to the unique path of some particular xref:refguide:extensions:index/secman/applib/tenancy/dom/ApplicationTenancy.adoc[ApplicationTenancy] instance. However, this has now been generalized; the atPath is simply a string whose interpretation is application-specific (in particular by the xref:refguide:extensions:index/secman/applib/tenancy/spi/ApplicationTenancyEvaluator.adoc[ApplicationTenancyEvaluator] SPI).
 
-For applications that still wish to follow the original more specific design (that the `atPath` corresponds to a single xref:refguide:extensions:index/secman/api/tenancy/dom/ApplicationTenancy.adoc[ApplicationTenancy] ), then the path can be interpreted according to the following table:
+For applications that still wish to follow the original more specific design (that the `atPath` corresponds to a single xref:refguide:extensions:index/secman/applib/tenancy/dom/ApplicationTenancy.adoc[ApplicationTenancy] ), then the path can be interpreted according to the following table:
 
-any object that is not tenanted (that is, its class does not implement xref:refguide:extensions:index/secman/api/tenancy/dom/HasAtPath.adoc[HasAtPath] is accessible by any user (usual permission rules apply).
+any object that is not tenanted (that is, its class does not implement xref:refguide:extensions:index/secman/applib/tenancy/dom/HasAtPath.adoc[HasAtPath] is accessible by any user (usual permission rules apply).
 
 == API
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/GlobalTenancy.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/seed/GlobalTenancy.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/GlobalTenancy.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/seed/GlobalTenancy.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/spi/ApplicationTenancyEvaluator.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/spi/ApplicationTenancyEvaluator.adoc
similarity index 82%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/spi/ApplicationTenancyEvaluator.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/spi/ApplicationTenancyEvaluator.adoc
index 82bd84c..50be6e4 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/spi/ApplicationTenancyEvaluator.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/tenancy/spi/ApplicationTenancyEvaluator.adoc
@@ -23,12 +23,12 @@ Whether this evaluator can determine the tenancy of the specified domain entity
 <.> xref:#hides__Object_ApplicationUser[hides(Object, ApplicationUser)]
 +
 --
-Whether this domain object should not be visible to the specified xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] .
+Whether this domain object should not be visible to the specified xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] .
 --
 <.> xref:#disables__Object_ApplicationUser[disables(Object, ApplicationUser)]
 +
 --
-Whether the object members of this domain object should be disabled/read-only for the specified xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] .
+Whether the object members of this domain object should be disabled/read-only for the specified xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] .
 --
 
 == Members
@@ -38,12 +38,12 @@ Whether the object members of this domain object should be disabled/read-only fo
 
 Whether this evaluator can determine the tenancy of the specified domain entity (such as `ToDoItem` ) being interacted with (the "what").
 
-This method is also called to determine if the evaluator is also able to determine the tenancy of the security module's own xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] , ie the "who" is doing the interacting. If the evaluator does not handle the class, then the fallback behaviour is to invoke _ApplicationUser#getAtPath()_ } on the xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] and use the path from that.
+This method is also called to determine if the evaluator is also able to determine the tenancy of the security module's own xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] , ie the "who" is doing the interacting. If the evaluator does not handle the class, then the fallback behaviour is to invoke _ApplicationUser#getAtPath()_ } on the xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] and use the path fr [...]
 
 [#hides__Object_ApplicationUser]
 === hides(Object, ApplicationUser)
 
-Whether this domain object should not be visible to the specified xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] .
+Whether this domain object should not be visible to the specified xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] .
 
 The domain object will be one that is handled by this evaluator, in other words that _#handles(Class)_ was previously called and the evaluator returned `true` .
 
@@ -52,7 +52,7 @@ A non-null return value means that the object should be hidden.
 [#disables__Object_ApplicationUser]
 === disables(Object, ApplicationUser)
 
-Whether the object members of this domain object should be disabled/read-only for the specified xref:refguide:extensions:index/secman/api/user/dom/ApplicationUser.adoc[ApplicationUser] .
+Whether the object members of this domain object should be disabled/read-only for the specified xref:refguide:extensions:index/secman/applib/user/dom/ApplicationUser.adoc[ApplicationUser] .
 
 The domain object will be one that is handled by this evaluator, in other words that _#handles(Class)_ was previously called and the evaluator returned `true` .
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/AccountType.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/AccountType.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/AccountType.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/AccountType.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUser.adoc
similarity index 54%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUser.adoc
index f24c34f..e32de7f 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/tenancy/dom/ApplicationTenancy.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUser.adoc
@@ -1,24 +1,30 @@
-= ApplicationTenancy _(interface)_
+= ApplicationUser
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.ApplicationTenancy.java
+.ApplicationUser.java
 ----
-interface ApplicationTenancy {
-  String OBJECT_TYPE;
-  String NAMED_QUERY_FIND_BY_NAME;
-  String NAMED_QUERY_FIND_BY_PATH;
-  String NAMED_QUERY_FIND_BY_NAME_OR_PATH_MATCHING;
+class ApplicationUser {
+  public static final String LOGICAL_TYPE_NAME;
+  public static final String NAMED_QUERY_FIND_BY_USERNAME;
+  public static final String NAMED_QUERY_FIND_BY_EMAIL_ADDRESS;
+  public static final String NAMED_QUERY_FIND;
+  public static final String NAMED_QUERY_FIND_BY_ATPATH;
   String title()
+  String iconName()
   String getName()
-  void setName(String name)
-  String getPath()
-  void setPath(String path)
-  ApplicationTenancy getParent()
-  void setParent(ApplicationTenancy parent)
-  Collection<ApplicationTenancy> getChildren()
+  boolean hideEncryptedPassword()
+  boolean isHasPassword()
+  boolean hideHasPassword()
+  ApplicationPermissionValueSet getPermissionSet()
+  boolean isForSelfOrRunAsAdministrator()
+  boolean isLocalAccount()
+  int compareTo(final org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser other)
+  boolean equals(final Object obj)
+  int hashCode()
+  String toString()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUserRepository.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserRepository.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUserRepository.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserRepository.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUserStatus.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserStatus.adoc
similarity index 86%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUserStatus.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserStatus.adoc
index 61a82ed..b50d080 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/dom/ApplicationUserStatus.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/dom/ApplicationUserStatus.adoc
@@ -1,7 +1,7 @@
 = ApplicationUserStatus _(enum)_
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Whether the user's account is enabled or disabled.
+Whether the user's account is locked or unlocked.
 
 == API
 
@@ -9,11 +9,11 @@ Whether the user's account is enabled or disabled.
 .ApplicationUserStatus.java
 ----
 enum ApplicationUserStatus {
-  ENABLED
-  DISABLED
-  ApplicationUserStatus parse(final Boolean enabled)
+  UNLOCKED
+  LOCKED
+  ApplicationUserStatus parse(final Boolean unlocked)
   String toString()
-  boolean isEnabled()
+  boolean isUnlocked()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/events/UserCreatedEvent.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/events/UserCreatedEvent.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/events/UserCreatedEvent.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/menu/MeService.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/menu/MeService.adoc
index 562719d..a7a9071 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/user/menu/MeService.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/menu/MeService.adoc
@@ -7,7 +7,7 @@
 .MeService.java
 ----
 class MeService {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   String iconName()
   ApplicationUser me()
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanAdminUser.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/seed/scripts/secman/IsisExtSecmanAdminUser.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/seed/IsisExtSecmanAdminUser.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/spi/PasswordEncryptionService.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/encryption/PasswordEncryptionService.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/applib/user/spi/PasswordEncryptionService.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/IsisModuleExtSecmanModel.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/IsisModuleExtSecmanIntegration.adoc
similarity index 87%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/IsisModuleExtSecmanModel.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/integration/IsisModuleExtSecmanIntegration.adoc
index b646a9a..2676cea 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/IsisModuleExtSecmanModel.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/IsisModuleExtSecmanIntegration.adoc
@@ -1,12 +1,12 @@
-= IsisModuleExtSecmanModel
+= IsisModuleExtSecmanIntegration
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
 == API
 
 [source,java]
-.IsisModuleExtSecmanModel.java
+.IsisModuleExtSecmanIntegration.java
 ----
-class IsisModuleExtSecmanModel {
+class IsisModuleExtSecmanIntegration {
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/authorizor/AuthorizorSecman.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/api/authorizor/AuthorizorSecman.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/integration/authorizor/AuthorizorSecman.adoc
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/userreg/UserRegistrationServiceForSecman.adoc
similarity index 73%
rename from antora/components/refguide-index/modules/extensions/pages/index/secman/model/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
rename to antora/components/refguide-index/modules/extensions/pages/index/secman/integration/userreg/UserRegistrationServiceForSecman.adoc
index 9c4f1aa..e2fb1d8 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/model/userreg/SecurityModuleAppUserRegistrationServiceAbstract.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/integration/userreg/UserRegistrationServiceForSecman.adoc
@@ -1,14 +1,14 @@
-= SecurityModuleAppUserRegistrationServiceAbstract
+= UserRegistrationServiceForSecman
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-An abstract implementation of xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[UserRegistrationService] with a single abstract method for the initial role of newly created local users
+An implementation of xref:refguide:applib:index/services/userreg/UserRegistrationService.adoc[UserRegistrationService] to allow users to be automatically created with the configured initial role(s).
 
 == API
 
 [source,java]
-.SecurityModuleAppUserRegistrationServiceAbstract.java
+.UserRegistrationServiceForSecman.java
 ----
-class SecurityModuleAppUserRegistrationServiceAbstract {
+class UserRegistrationServiceForSecman {
   boolean usernameExists(final String username)
   void registerUser(final UserDetails userDetails)
   boolean emailExists(final String emailAddress)
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
index a52b4ac..cc76d6f 100644
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
+++ b/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc
@@ -8,7 +8,6 @@
 ----
 class IsisModuleExtSecmanShiroRealm {
   IsisModuleExtSecmanShiroRealm()     // <.>
-  EnumSet<SecurityRealmCharacteristic> getCharacteristics()
   V execute(final Supplier<V> closure)
   V doExecute(final Supplier<V> closure)
 }
diff --git a/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc b/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc
deleted file mode 100644
index d74aa1a..0000000
--- a/antora/components/refguide-index/modules/extensions/pages/index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= SecurityRealmServiceUsingShiro
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.SecurityRealmServiceUsingShiro.java
-----
-class SecurityRealmServiceUsingShiro {
-  SecurityRealm getCurrentRealm()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
index f4835f2..8199ba7 100644
--- a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
+++ b/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture.adoc
@@ -9,7 +9,7 @@ This class should be executed using _org.apache.isis.testing.fixtures.applib.fix
 .ExcelFixture.java
 ----
 class ExcelFixture {
-  public final static String OBJECT_TYPE;
+  public final static String LOGICAL_TYPE_NAME;
   ExcelFixture(final URL excelResource, final Class<?>... classes)
   ExcelFixture(final URL excelResource, final List<Class<?>> classes)
   ExcelFixture(final Blob upload, final Class<?>... classes)
diff --git a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc b/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
index b350fa6..664c596 100644
--- a/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
+++ b/antora/components/refguide-index/modules/subdomains/pages/index/excel/testing/ExcelFixture2.adoc
@@ -9,7 +9,7 @@ This class should be executed using _org.apache.isis.testing.fixtures.applib.fix
 .ExcelFixture2.java
 ----
 class ExcelFixture2 {
-  public final static String OBJECT_TYPE;
+  public final static String LOGICAL_TYPE_NAME;
   boolean equals(final Object o)
   int hashCode()
 }
diff --git a/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc b/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
index ad3b434..4b15483 100644
--- a/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
+++ b/antora/components/refguide-index/modules/testing/pages/index/h2console/ui/services/H2ManagerMenu.adoc
@@ -7,7 +7,7 @@
 .H2ManagerMenu.java
 ----
 class H2ManagerMenu {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   H2ManagerMenu(final WebModuleH2Console webModule)
   LocalResourcePath openH2Console()
   boolean hideOpenH2Console()
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonate.adoc b/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonate.adoc
index 12ec227..6d0fbf4 100644
--- a/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonate.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonate.adoc
@@ -12,6 +12,7 @@ class Object_impersonate {
   Object act(final String userName)
   boolean hideAct()
   String disableAct()
+  String default0Act()
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonateWithRoles.adoc b/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonateWithRoles.adoc
index c26dc3a..7941ea5 100644
--- a/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonateWithRoles.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/common/applib/mixins/Object_impersonateWithRoles.adoc
@@ -1,7 +1,7 @@
 = Object_impersonateWithRoles
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
 
-Same as _ImpersonateMenu#impersonateWithRoles(String, boolean, List)_ , but implemented as a mixin so that can be invoked while accessing an object.
+Same as _ImpersonateMenu#impersonateWithRoles(String, List)_ , but implemented as a mixin so that can be invoked while accessing an object.
 
 == API
 
@@ -9,12 +9,13 @@ Same as _ImpersonateMenu#impersonateWithRoles(String, boolean, List)_ , but impl
 .Object_impersonateWithRoles.java
 ----
 class Object_impersonateWithRoles {
-  Object act(final String userName, final boolean useUsersRoles, final List<String> roleNames)
+  Object act(final String userName, final List<String> roleNames)
   boolean hideAct()
   String disableAct()
   List<String> choices0Act()
-  List<String> choices2Act(final String userName, final boolean useUsersRoles)
-  List<String> default2Act(final String userName, final boolean useUsersRoles)
+  String default0Act()
+  List<String> choices1Act(final String userName)
+  List<String> default1Act(final String userName)
 }
 ----
 
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
index ba10e31..d7a8372 100644
--- a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.adoc
@@ -7,7 +7,7 @@
 .SwaggerServiceMenu.java
 ----
 class SwaggerServiceMenu {
-  public static final String OBJECT_TYPE;
+  public static final String LOGICAL_TYPE_NAME;
   SwaggerServiceMenu(final SwaggerService swaggerService, final ServiceRegistry serviceRegistry, final RestEasyConfiguration restEasyConfiguration)
   LocalResourcePath openSwaggerUi()
   String disableOpenSwaggerUi()
diff --git a/antora/components/refguide/modules/applib-ant/pages/Discriminator.adoc b/antora/components/refguide/modules/applib-ant/pages/Discriminator.adoc
index aeb0ce4..bbe0b05 100644
--- a/antora/components/refguide/modules/applib-ant/pages/Discriminator.adoc
+++ b/antora/components/refguide/modules/applib-ant/pages/Discriminator.adoc
@@ -48,7 +48,7 @@ has an object type of `custmgmt.Customer`.
 The rules of precedence for determining a domain object's object type are:
 
 1. xref:refguide:applib-ant:Discriminator.adoc[@Discriminator]
-2. `@DomainObject#objectType`
+2. `@DomainObject#logicalTypeName`
 3. xref:refguide:applib-ant:PersistenceCapable.adoc[@PersistenceCapable], if at least the `schema` attribute is defined.
 +
 If both `schema` and `table` are defined, then the value is "`schema.table`".
diff --git a/antora/components/refguide/modules/applib-ant/pages/PersistenceCapable.adoc b/antora/components/refguide/modules/applib-ant/pages/PersistenceCapable.adoc
index 26446eb..3deb122 100644
--- a/antora/components/refguide/modules/applib-ant/pages/PersistenceCapable.adoc
+++ b/antora/components/refguide/modules/applib-ant/pages/PersistenceCapable.adoc
@@ -73,7 +73,7 @@ does _not_ correspond to an object type, because the `schema` attribute is missi
 The rules of precedence for determining a domain object's object type are:
 
 1. xref:refguide:applib-ant:Discriminator.adoc[@Discriminator]
-2. `@DomainObject#objectType`
+2. `@DomainObject#logicalTypeName`
 3. xref:refguide:applib-ant:PersistenceCapable.adoc[@PersistenceCapable], if at least the `schema` attribute is defined.
 +
 If both `schema` and `table` are defined, then the value is "`schema.table`".
diff --git a/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc b/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
index 9cdd6c4..415f440 100644
--- a/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
+++ b/antora/components/refguide/modules/applib-classes/pages/mixees-and-mixins.adoc
@@ -23,7 +23,7 @@ The framework provides a number of mixins that contributes to `java.lang.Object`
 * Metamodel
 ** xref:refguide:applib:index/mixins/metamodel/Object_downloadMetamodelXml.adoc[Object_downloadMetamodelXml]
 ** xref:refguide:applib:index/mixins/metamodel/Object_rebuildMetamodel.adoc[Object_rebuildMetamodel]
-** xref:refguide:applib:index/mixins/metamodel/Object_objectType.adoc[Object_objectType] (property)
+** xref:refguide:applib:index/mixins/metamodel/Object_logicalTypeName.adoc[Object_logicalTypeName] (property)
 ** xref:refguide:applib:index/mixins/metamodel/Object_objectIdentifier.adoc[Object_objectIdentifier] (property)
 
 * Wicket viewer:
diff --git a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
index 81362a6..bc0c02a 100644
--- a/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
+++ b/antora/components/refguide/modules/applib-classes/partials/module-nav.adoc
@@ -33,7 +33,7 @@
 
 *** xref:refguide:applib:index/mixins/metamodel/Object_downloadMetamodelXml.adoc[Object_downloadMetamodelXml]
 *** xref:applib:index/mixins/metamodel/Object_rebuildMetamodel.adoc[Object_rebuildMetamodel]
-*** xref:refguide:applib:index/mixins/metamodel/Object_objectType.adoc[Object_objectType] (property)
+*** xref:refguide:applib:index/mixins/metamodel/Object_logicalTypeName.adoc[Object_logicalTypeName] (property)
 *** xref:refguide:applib:index/mixins/metamodel/Object_objectIdentifier.adoc[Object_objectIdentifier] (property)
 
 *** xref:viewer:index/wicket/viewer/mixins/Object_clearHints.adoc[Object_clearHints]
diff --git a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
index 91cf1f6..dfdcea9 100644
--- a/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
+++ b/antora/components/userguide/modules/fun/pages/domain-entities-and-services/domain-entities.adoc
@@ -60,7 +60,7 @@ With the xref:pjdo:ROOT:about.adoc[JDO API], entities are flagged as being "pers
         column="version"
 )
 @DomainObject(                                                          // <.>
-        objectType = "simple.SimpleObject"
+        logicalTypeName = "simple.SimpleObject"
 )
 public class SimpleObject { /* ... */ }
 ----
@@ -82,7 +82,7 @@ A common strategy is to allow the database to assign the id, for example using a
 
 <.> The `@DomainObject` annotation identifies the domain object to Apache Isis (not DataNucleus).
 It isn't necessary to include this annotation -- at least, not for entities -- but it is nevertheless recommended.
-In particular, its strongly recommended that the `objectType` (which acts like an alias to the concrete domain class) is specified; note that it corresponds to the schema/table for DataNucleus' `@PersistenceCapable` annotation.
+In particular, its strongly recommended that the `logicalTypeName` (which acts like an alias to the concrete domain class) is specified; note that it corresponds to the schema/table for DataNucleus' `@PersistenceCapable` annotation.
 
 
 === Key Properties (JDO)
diff --git a/api/schema/src/main/adoc/modules/schema/pages/cmd.adoc b/api/schema/src/main/adoc/modules/schema/pages/cmd.adoc
index 05f514d..d5dd5a9 100644
--- a/api/schema/src/main/adoc/modules/schema/pages/cmd.adoc
+++ b/api/schema/src/main/adoc/modules/schema/pages/cmd.adoc
@@ -124,7 +124,7 @@ The `actionDto` and `propertyDto` are the concrete subtypes:
 <1> the `memberDto` is an abstract type.
 Its primary responsibility is simply to identify the member (action or property).
 <2> the formal identifier (fully qualified class name + member name) of the member being interacted with (action or property).
-<3> the "logical" formal identifier (object type, as per `@DomainObject(objectType=)`, + member name) of the member being interacted with (action or property).
+<3> the "logical" formal identifier (object type, as per `@DomainObject(logicalTypeName=)`, + member name) of the member being interacted with (action or property).
 <4> the `interactionType` attribute indicates whether the member is an action or a property.
 <5> the `actionDto` complex type captures the set of parameters (also including the argument values) with which to invoke the action.
 The `paramsDto` type is defined xref:refguide:schema:cmd/ancillary.adoc[below].
diff --git a/api/schema/src/main/adoc/modules/schema/pages/common.adoc b/api/schema/src/main/adoc/modules/schema/pages/common.adoc
index 1e451d0..c58bfde 100644
--- a/api/schema/src/main/adoc/modules/schema/pages/common.adoc
+++ b/api/schema/src/main/adoc/modules/schema/pages/common.adoc
@@ -52,7 +52,7 @@ The `oidDto` complex type is defined as:
 Although URIs are not the same as URLs, you will find that the schemas are also downloadable from this location.
 <2> the `oidDto` complex type defines the unique identifier for any domain object: its type, and an identifier.
 The `objectState` attribute can usually be omitted (indicating a persistent object)
-<3> the object type, corresponding to either the xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[@DomainObject#objectType()] attribute, or to the (JDO)
+<3> the object type, corresponding to either the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[@DomainObject#logicalTypeName()] attribute, or to the (JDO)
 xref:refguide:applib-ant:PersistenceCapable.adoc[@PersistenceCapable] annotation (`schema` and/or `table` attributes), or to the (JDO) xref:refguide:applib-ant:Discriminator.adoc[@Discriminator] annotation.
 If none is specified, then the fully qualified class name will be used.
 <4> the object identifier (aka primary key), converted to string form.
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index 7eeba17..8113437 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -796,7 +796,7 @@ Directory: /examples/demo
 com.h2database:h2:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jpa:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
@@ -819,7 +819,214 @@ Artifact: demo-domain
 Type: jar
 Directory: /examples/demo/domain
 ----
-|.Dependencies
+|.Components
+****
+demoapp.dom.AppConfiguration +
+demoapp.dom._infra.DefaultTitleProvider +
+demoapp.dom._infra.LibraryPreloadingService +
+demoapp.dom._infra.fixtures.DemoFixtureScriptSpecificationProvider +
+demoapp.dom._infra.resources.AsciiDocConverterService +
+demoapp.dom._infra.resources.AsciiDocReaderService +
+demoapp.dom._infra.resources.MarkdownReaderService +
+demoapp.dom._infra.resources.MarkupReaderService +
+demoapp.dom._infra.resources.MarkupVariableResolverService +
+demoapp.dom._infra.resources.ResourceReaderService +
+demoapp.dom._infra.samples.NameSamples +
+demoapp.dom._infra.urlencoding.UrlEncodingServiceNaiveInMemory +
+demoapp.dom.domain._changes.EntityChangesSubscriberToCaptureChangesInMemory +
+demoapp.dom.domain._commands.ExposePersistedCommands$TableColumnOrderDefault +
+demoapp.dom.domain._interactions.ExecutionListenerToCaptureInteractionsInMemory +
+demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoEntities +
+demoapp.dom.domain.actions.Action.commandPublishing.ActionCommandPublishingJdoSeedService +
+demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoEntities +
+demoapp.dom.domain.actions.Action.executionPublishing.ActionExecutionPublishingJdoSeedService +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.disabled.DomainObjectEntityChangePublishingDisabledJdoSeedService +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.annotated.enabled.DomainObjectAuditingEnabledJdoSeedService +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnot.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotatedJdoSeedService +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoEntities +
+demoapp.dom.domain.objects.DomainObject.entityChangePublishing.metaAnnotOverridden.enabled.DomainObjectEntityChangePublishingEnabledMetaAnnotOverriddenJdoSeedService +
+demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.ChildJdoEntities +
+demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.seed.ChildJdoSeedService +
+demoapp.dom.domain.objects.other.embedded.NumberConstantJdoRepository +
+demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoEntities +
+demoapp.dom.domain.properties.Property.commandPublishing.PropertyCommandPublishingJdoSeedService +
+demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoEntities +
+demoapp.dom.domain.properties.Property.executionPublishing.PropertyExecutionPublishingJdoSeedService +
+demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoEntities +
+demoapp.dom.domain.properties.Property.projecting.jdo.PropertyProjectingChildJdoSeedService +
+demoapp.dom.domain.properties.PropertyLayout.navigable.FileTreeNodeService +
+demoapp.dom.domain.properties.PropertyLayout.repainting.PdfJsViewerAdvisorFallback +
+demoapp.dom.featured.customui.geocoding.GeoapifyClient +
+demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoImplementation +
+demoapp.dom.services.core.eventbusservice.EventLogEntryJdoRepository +
+demoapp.dom.services.core.eventbusservice.EventLogEntryJpaRepository +
+demoapp.dom.services.core.eventbusservice.EventSubscriberDemoImplementation +
+demoapp.dom.services.core.wrapperFactory.WrapperFactorySeeding +
+demoapp.dom.services.core.wrapperFactory.jdo.WrapperFactoryJdoEntities +
+demoapp.dom.services.core.wrapperFactory.jpa.WrapperFactoryJpaEntities +
+demoapp.dom.services.extensions.secman.apptenancy.ApplicationTenancyEvaluatorForDemo +
+demoapp.dom.services.extensions.secman.apptenancy.jdo.TenantedJdoEntities +
+demoapp.dom.services.extensions.secman.apptenancy.jpa.TenantedJpaEntities +
+demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedSeeding +
+demoapp.dom.types.isis.blobs.jdo.IsisBlobJdoEntities +
+demoapp.dom.types.isis.blobs.jpa.IsisBlobJpaEntities +
+demoapp.dom.types.isis.blobs.persistence.IsisBlobSeeding +
+demoapp.dom.types.isis.blobs.samples.IsisBlobsSamples +
+demoapp.dom.types.isis.clobs.jdo.IsisClobJdoEntities +
+demoapp.dom.types.isis.clobs.jpa.IsisClobJpaEntities +
+demoapp.dom.types.isis.clobs.persistence.IsisClobSeeding +
+demoapp.dom.types.isis.clobs.samples.IsisClobsSamples +
+demoapp.dom.types.isis.localresourcepaths.jdo.IsisLocalResourcePathJdoEntities +
+demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpaEntities +
+demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathSeeding +
+demoapp.dom.types.isis.localresourcepaths.samples.IsisLocalResourcePathsSamples +
+demoapp.dom.types.isis.markups.jdo.IsisMarkupJdoEntities +
+demoapp.dom.types.isis.markups.jpa.IsisMarkupJpaEntities +
+demoapp.dom.types.isis.markups.persistence.IsisMarkupSeeding +
+demoapp.dom.types.isis.markups.samples.IsisMarkupSamples +
+demoapp.dom.types.isis.passwords.jdo.IsisPasswordJdoEntities +
+demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpaEntities +
+demoapp.dom.types.isis.passwords.persistence.IsisPasswordSeeding +
+demoapp.dom.types.isis.passwords.samples.IsisPasswordsSamples +
+demoapp.dom.types.isisext.asciidocs.jdo.IsisAsciiDocJdoEntities +
+demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpaEntities +
+demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocSeeding +
+demoapp.dom.types.isisext.asciidocs.samples.IsisAsciiDocSamples +
+demoapp.dom.types.isisext.markdowns.jdo.IsisMarkdownJdoEntities +
+demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpaEntities +
+demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownSeeding +
+demoapp.dom.types.isisext.markdowns.samples.IsisMarkdownSamples +
+demoapp.dom.types.javaawt.images.jdo.JavaAwtBufferedImageJdoEntities +
+demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpaEntities +
+demoapp.dom.types.javaawt.images.persistence.JavaAwtBufferedImageSeeding +
+demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImageService +
+demoapp.dom.types.javaawt.images.samples.JavaAwtBufferedImagesSamples +
+demoapp.dom.types.javalang.booleans.jdo.WrapperBooleanJdoEntities +
+demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpaEntities +
+demoapp.dom.types.javalang.booleans.persistence.WrapperBooleanSeeding +
+demoapp.dom.types.javalang.booleans.samples.WrapperBooleanSamples +
+demoapp.dom.types.javalang.bytes.jdo.WrapperByteJdoEntities +
+demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpaEntities +
+demoapp.dom.types.javalang.bytes.persistence.WrapperByteSeeding +
+demoapp.dom.types.javalang.bytes.samples.WrapperByteSamples +
+demoapp.dom.types.javalang.characters.jdo.WrapperCharacterJdoEntities +
+demoapp.dom.types.javalang.characters.jpa.WrapperCharacterJpaEntities +
+demoapp.dom.types.javalang.characters.persistence.WrapperCharacterSeeding +
+demoapp.dom.types.javalang.characters.samples.WrapperCharacterSamples +
+demoapp.dom.types.javalang.doubles.jdo.WrapperDoubleJdoEntities +
+demoapp.dom.types.javalang.doubles.jpa.WrapperDoubleJpaEntities +
+demoapp.dom.types.javalang.doubles.persistence.WrapperDoubleSeeding +
+demoapp.dom.types.javalang.doubles.samples.WrapperDoubleSamples +
+demoapp.dom.types.javalang.floats.jdo.WrapperFloatJdoEntities +
+demoapp.dom.types.javalang.floats.jpa.WrapperFloatJpaEntities +
+demoapp.dom.types.javalang.floats.persistence.WrapperFloatSeeding +
+demoapp.dom.types.javalang.floats.samples.WrapperFloatSamples +
+demoapp.dom.types.javalang.integers.jdo.WrapperIntegerJdoEntities +
+demoapp.dom.types.javalang.integers.jpa.WrapperIntegerJpaEntities +
+demoapp.dom.types.javalang.integers.persistence.WrapperIntegerSeeding +
+demoapp.dom.types.javalang.integers.samples.WrapperIntegerSamples +
+demoapp.dom.types.javalang.longs.jdo.WrapperLongJdoEntities +
+demoapp.dom.types.javalang.longs.jpa.WrapperLongJpaEntities +
+demoapp.dom.types.javalang.longs.persistence.WrapperLongSeeding +
+demoapp.dom.types.javalang.longs.samples.WrapperLongSamples +
+demoapp.dom.types.javalang.shorts.jdo.WrapperShortJdoEntities +
+demoapp.dom.types.javalang.shorts.jpa.WrapperShortJpaEntities +
+demoapp.dom.types.javalang.shorts.persistence.WrapperShortSeeding +
+demoapp.dom.types.javalang.shorts.samples.WrapperShortSamples +
+demoapp.dom.types.javalang.strings.jdo.JavaLangStringJdoEntities +
+demoapp.dom.types.javalang.strings.jpa.JavaLangStringJpaEntities +
+demoapp.dom.types.javalang.strings.persistence.JavaLangStringSeeding +
+demoapp.dom.types.javalang.strings.samples.JavaLangStringSamples +
+demoapp.dom.types.javamath.bigdecimals.jdo.JavaMathBigDecimalJdoEntities +
+demoapp.dom.types.javamath.bigdecimals.jpa.JavaMathBigDecimalJpaEntities +
+demoapp.dom.types.javamath.bigdecimals.persistence.JavaMathBigDecimalSeeding +
+demoapp.dom.types.javamath.bigdecimals.samples.JavaMathBigDecimalSamples +
+demoapp.dom.types.javamath.bigintegers.jdo.JavaMathBigIntegerJdoEntities +
+demoapp.dom.types.javamath.bigintegers.jpa.JavaMathBigIntegerJpaEntities +
+demoapp.dom.types.javamath.bigintegers.persistence.JavaMathBigIntegerSeeding +
+demoapp.dom.types.javamath.bigintegers.samples.JavaMathBigIntegerSamples +
+demoapp.dom.types.javanet.urls.jdo.JavaNetUrlJdoEntities +
+demoapp.dom.types.javanet.urls.jpa.JavaNetUrlJpaEntities +
+demoapp.dom.types.javanet.urls.persistence.JavaNetUrlSeeding +
+demoapp.dom.types.javanet.urls.samples.JavaNetUrlSamples +
+demoapp.dom.types.javasql.javasqldate.jdo.JavaSqlDateJdoEntities +
+demoapp.dom.types.javasql.javasqldate.jpa.JavaSqlDateJpaEntities +
+demoapp.dom.types.javasql.javasqldate.persistence.JavaSqlDateSeeding +
+demoapp.dom.types.javasql.javasqldate.samples.JavaSqlDateSamples +
+demoapp.dom.types.javasql.javasqltimestamp.jdo.JavaSqlTimestampJdoEntities +
+demoapp.dom.types.javasql.javasqltimestamp.jpa.JavaSqlTimestampJpaEntities +
+demoapp.dom.types.javasql.javasqltimestamp.persistence.JavaSqlTimestampSeeding +
+demoapp.dom.types.javasql.javasqltimestamp.samples.JavaSqlTimestampSamples +
+demoapp.dom.types.javatime.javatimelocaldate.jdo.JavaTimeLocalDateJdoEntities +
+demoapp.dom.types.javatime.javatimelocaldate.jpa.JavaTimeLocalDateJpaEntities +
+demoapp.dom.types.javatime.javatimelocaldate.persistence.JavaTimeLocalDateSeeding +
+demoapp.dom.types.javatime.javatimelocaldate.samples.JavaTimeLocalDateSamples +
+demoapp.dom.types.javatime.javatimelocaldatetime.jdo.JavaTimeLocalDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimelocaldatetime.jpa.JavaTimeLocalDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimelocaldatetime.persistence.JavaTimeLocalDateTimeSeeding +
+demoapp.dom.types.javatime.javatimelocaldatetime.samples.JavaTimeLocalDateTimeSamples +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.jdo.JavaTimeOffsetDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.jpa.JavaTimeOffsetDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.persistence.JavaTimeOffsetDateTimeSeeding +
+demoapp.dom.types.javatime.javatimeoffsetdatetime.samples.JavaTimeOffsetDateTimeSamples +
+demoapp.dom.types.javatime.javatimeoffsettime.jdo.JavaTimeOffsetTimeJdoEntities +
+demoapp.dom.types.javatime.javatimeoffsettime.jpa.JavaTimeOffsetTimeJpaEntities +
+demoapp.dom.types.javatime.javatimeoffsettime.persistence.JavaTimeOffsetTimeSeeding +
+demoapp.dom.types.javatime.javatimeoffsettime.samples.JavaTimeOffsetTimeSamples +
+demoapp.dom.types.javatime.javatimezoneddatetime.jdo.JavaTimeZonedDateTimeJdoEntities +
+demoapp.dom.types.javatime.javatimezoneddatetime.jpa.JavaTimeZonedDateTimeJpaEntities +
+demoapp.dom.types.javatime.javatimezoneddatetime.persistence.JavaTimeZonedDateTimeSeeding +
+demoapp.dom.types.javatime.javatimezoneddatetime.samples.JavaTimeZonedDateTimeSamples +
+demoapp.dom.types.javautil.javautildate.jdo.JavaUtilDateJdoEntities +
+demoapp.dom.types.javautil.javautildate.jpa.JavaUtilDateJpaEntities +
+demoapp.dom.types.javautil.javautildate.persistence.JavaUtilDateSeeding +
+demoapp.dom.types.javautil.javautildate.samples.JavaUtilDateSamples +
+demoapp.dom.types.javautil.uuids.jdo.JavaUtilUuidJdoEntities +
+demoapp.dom.types.javautil.uuids.jpa.JavaUtilUuidJpaEntities +
+demoapp.dom.types.javautil.uuids.persistence.JavaUtilUuidSeeding +
+demoapp.dom.types.javautil.uuids.samples.JavaUtilUuidSamples +
+demoapp.dom.types.jodatime.jodadatetime.jdo.JodaDateTimeJdoEntities +
+demoapp.dom.types.jodatime.jodadatetime.persistence.JodaDateTimeJdoSeeding +
+demoapp.dom.types.jodatime.jodadatetime.samples.JodaDateTimeSamples +
+demoapp.dom.types.jodatime.jodalocaldate.jdo.JodaLocalDateJdoEntities +
+demoapp.dom.types.jodatime.jodalocaldate.persistence.JodaLocalDateJdoSeeding +
+demoapp.dom.types.jodatime.jodalocaldate.samples.JodaLocalDateSamples +
+demoapp.dom.types.jodatime.jodalocaldatetime.jdo.JodaLocalDateTimeJdoEntities +
+demoapp.dom.types.jodatime.jodalocaldatetime.persistence.JodaLocalDateTimeSeeding +
+demoapp.dom.types.jodatime.jodalocaldatetime.samples.JodaLocalDateTimeSamples +
+demoapp.dom.types.jodatime.jodalocaltime.jdo.JodaLocalTimeJdoEntities +
+demoapp.dom.types.jodatime.jodalocaltime.persistence.JodaLocalTimeSeeding +
+demoapp.dom.types.jodatime.jodalocaltime.samples.JodaLocalTimeSamples +
+demoapp.dom.types.primitive.booleans.jdo.PrimitiveBooleanJdoEntities +
+demoapp.dom.types.primitive.booleans.jpa.PrimitiveBooleanJpaEntities +
+demoapp.dom.types.primitive.booleans.persistence.PrimitiveBooleanSeeding +
+demoapp.dom.types.primitive.bytes.jdo.PrimitiveByteJdoEntities +
+demoapp.dom.types.primitive.bytes.jpa.PrimitiveByteJpaEntities +
+demoapp.dom.types.primitive.bytes.persistence.PrimitiveByteSeeding +
+demoapp.dom.types.primitive.chars.jdo.PrimitiveCharJdoEntities +
+demoapp.dom.types.primitive.chars.jpa.PrimitiveCharJpaEntities +
+demoapp.dom.types.primitive.chars.persistence.PrimitiveCharSeeding +
+demoapp.dom.types.primitive.doubles.jdo.PrimitiveDoubleJdoEntities +
+demoapp.dom.types.primitive.doubles.jpa.PrimitiveDoubleJpaEntities +
+demoapp.dom.types.primitive.doubles.persistence.PrimitiveDoubleSeeding +
+demoapp.dom.types.primitive.floats.jdo.PrimitiveFloatJdoEntities +
+demoapp.dom.types.primitive.floats.jpa.PrimitiveFloatJpaEntities +
+demoapp.dom.types.primitive.floats.persistence.PrimitiveFloatSeeding +
+demoapp.dom.types.primitive.ints.jdo.PrimitiveIntJdoEntities +
+demoapp.dom.types.primitive.ints.jpa.PrimitiveIntJpaEntities +
+demoapp.dom.types.primitive.ints.persistence.PrimitiveIntSeeding +
+demoapp.dom.types.primitive.longs.jdo.PrimitiveLongJdoEntities +
+demoapp.dom.types.primitive.longs.jpa.PrimitiveLongJpaEntities +
+demoapp.dom.types.primitive.longs.persistence.PrimitiveLongSeeding +
+demoapp.dom.types.primitive.shorts.jdo.PrimitiveShortJdoEntities +
+demoapp.dom.types.primitive.shorts.jpa.PrimitiveShortJpaEntities +
+demoapp.dom.types.primitive.shorts.persistence.PrimitiveShortSeeding +
+****
+
+.Dependencies
 ****
 com.h2database:h2:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-command-log-jdo:jar:<managed> +
@@ -827,7 +1034,7 @@ org.apache.isis.extensions:isis-extensions-command-log-jpa:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-exceldownload-ui:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jpa:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
@@ -893,7 +1100,12 @@ Artifact: demo-web
 Type: jar
 Directory: /examples/demo/web
 ----
-|.Dependencies
+|.Components
+****
+demoapp.web._infra.utils.ThereCanBeOnlyOne +
+****
+
+.Dependencies
 ****
 org.apache.isis.examples.apps:demo-domain:jar:${project.version} +
 org.apache.isis.extensions:isis-extensions-command-replay-primary:jar:<managed> +
@@ -913,7 +1125,12 @@ Artifact: demo-wicket-common
 Type: jar
 Directory: /examples/demo/wicket/common
 ----
-|.Dependencies
+|.Components
+****
+demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory +
+****
+
+.Dependencies
 ****
 org.apache.isis.examples.apps:demo-web:jar:${project.version} +
 org.apache.isis.extensions:isis-extensions-pdfjs-ui:jar:<managed> +
@@ -1293,7 +1510,7 @@ org.jmock:jmock:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:refguide:applib:index/adapters/DefaultsProvider.adoc [...]
+xref:refguide:applib:index/AbstractViewModel.adoc[AbstractViewModel], xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:refguide:applib:index/adapters/DefaultsProvider.adoc [...]
 ****
 
 |Apache Isis Core - Code Gen (ByteBuddy)
@@ -1584,7 +1801,7 @@ org.junit.vintage:junit-vintage-engine:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:core:index/security/authentication/Authentication.adoc[Authentication], xref:refguide:core:index/security/authentication/AuthenticationRequest.adoc[AuthenticationRequest], xref:refguide:core:index/security/authentication/Authenticator.adoc[Authenticator], xref:refguide:core:index/security/authorization/Authorizor.adoc[Authorizor]
+xref:refguide:core:index/security/authentication/Authentication.adoc[Authentication], xref:refguide:core:index/security/authentication/AuthenticationRequest.adoc[AuthenticationRequest], xref:refguide:core:index/security/authentication/Authenticator.adoc[Authenticator], xref:refguide:core:index/security/authorization/Authorizor.adoc[Authorizor], xref:refguide:core:index/security/authorization/manager/AuthorizationManager.adoc[AuthorizationManager], xref:refguide:core:index/security/author [...]
 ****
 
 |Apache Isis Core - Transaction
@@ -4142,15 +4359,15 @@ org.apache.isis.core:isis-core-security:jar:<managed> +
 [source,yaml]
 ----
 Group: org.apache.isis.extensions
-Artifact: isis-extensions-secman-api
+Artifact: isis-extensions-secman-applib
 Type: jar
-Directory: /extensions/security/secman/api
+Directory: /extensions/security/secman/applib
 ----
 |.Components
 ****
-o.a.i.extensions.secman.api.authorizor.AuthorizorSecman +
-o.a.i.extensions.secman.api.feature.dom.ApplicationFeatureChoices +
-o.a.i.extensions.secman.api.role.dom.ApplicationRoleRepositoryAbstract +
+o.a.i.extensions.secman.applib.feature.api.ApplicationFeatureChoices +
+o.a.i.extensions.secman.applib.role.dom.ApplicationRoleRepositoryAbstract +
+o.a.i.extensions.secman.applib.seed.SeedSecurityModuleService +
 ****
 
 .Dependencies
@@ -4160,7 +4377,7 @@ org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/secman/api/IsisModuleExtSecmanApi.adoc[IsisModuleExtSecmanApi], xref:refguide:extensions:index/secman/api/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/api/SecurityRealm.adoc[SecurityRealm], xref:refguide:extensions:index/secman/api/SecurityRealmCharacteristic.adoc[SecurityRealmCharacteristic], xref:refguide:extensions:index/secman/api/SecurityRealmService.adoc[SecurityRealmService], xref:refguide:extensions:index/secm [...]
+xref:refguide:extensions:index/secman/applib/IsisModuleExtSecmanApplib.adoc[IsisModuleExtSecmanApplib], xref:refguide:extensions:index/secman/applib/SecmanConfiguration.adoc[SecmanConfiguration], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermission.adoc[ApplicationPermission], xref:refguide:extensions:index/secman/applib/permission/dom/ApplicationPermissionMode.adoc[ApplicationPermissionMode], xref:refguide:extensions:index/secman/applib/permission/dom/Applic [...]
 ****
 
 |Apache Isis Ext - Sec Man Encryption (Using jbcrypt)
@@ -4179,7 +4396,7 @@ o.a.i.extensions.secman.encryption.jbcrypt.services.PasswordEncryptionServiceUsi
 .Dependencies
 ****
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-applib:jar:<managed> +
 org.mindrot:jbcrypt:jar:<managed> +
 ****
 
@@ -4192,27 +4409,28 @@ xref:refguide:extensions:index/secman/encryption/jbcrypt/IsisModuleExtSecmanEncr
 [source,yaml]
 ----
 Group: org.apache.isis.extensions
-Artifact: isis-extensions-secman-model
+Artifact: isis-extensions-secman-integration
 Type: jar
-Directory: /extensions/security/secman/model
+Directory: /extensions/security/secman/integration
 ----
 |.Components
 ****
-o.a.i.extensions.secman.model.facets.TenantedAuthorizationPostProcessor$Register +
-o.a.i.extensions.secman.model.seed.SeedSecurityModuleService +
-o.a.i.extensions.secman.model.spiimpl.ImpersonateMenuAdvisorForSecman +
-o.a.i.extensions.secman.model.spiimpl.TableColumnVisibilityServiceForSecman +
+o.a.i.extensions.secman.integration.authorizor.AuthorizorSecman +
+o.a.i.extensions.secman.integration.facets.TenantedAuthorizationPostProcessor$Register +
+o.a.i.extensions.secman.integration.spiimpl.ImpersonateMenuAdvisorForSecman +
+o.a.i.extensions.secman.integration.spiimpl.TableColumnVisibilityServiceForSecman +
+o.a.i.extensions.secman.integration.userreg.UserRegistrationServiceForSecman +
 ****
 
 .Dependencies
 ****
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-applib:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/secman/model/IsisModuleExtSecmanModel.adoc[IsisModuleExtSecmanModel], xref:refguide:extensions:index/secman/model/seed/SeedSecurityModuleService.adoc[SeedSecurityModuleService], xref:refguide:extensions:index/secman/model/seed/scripts/SeedUsersAndRolesFixtureScript.adoc[SeedUsersAndRolesFixtureScript], xref:refguide:extensions:index/secman/model/seed/scripts/other/IsisConfigurationRoleAndPermissions.adoc[IsisConfigurationRoleAndPermissions], xref:refguide:e [...]
+xref:refguide:extensions:index/secman/integration/IsisModuleExtSecmanIntegration.adoc[IsisModuleExtSecmanIntegration], xref:refguide:extensions:index/secman/integration/authorizor/AuthorizorSecman.adoc[AuthorizorSecman], xref:refguide:extensions:index/secman/integration/userreg/UserRegistrationServiceForSecman.adoc[UserRegistrationServiceForSecman]
 ****
 
 |Apache Isis Ext - Sec Man Persistence (Using JDO)
@@ -4235,8 +4453,8 @@ o.a.i.extensions.secman.jdo.util.RegexReplacer +
 .Dependencies
 ****
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-applib:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-applib:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jdo-datanucleus:jar:<managed> +
 org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
@@ -4267,8 +4485,8 @@ o.a.i.extensions.secman.jpa.util.RegexReplacer +
 .Dependencies
 ****
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-applib:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.persistence:isis-persistence-jpa-applib:jar:<managed> +
 org.apache.isis.testing:isis-testing-fixtures-applib:jar:<managed> +
 ****
@@ -4286,21 +4504,16 @@ Artifact: isis-extensions-secman-shiro-realm
 Type: jar
 Directory: /extensions/security/secman/shiro-realm
 ----
-|.Components
-****
-o.a.i.extensions.secman.shiro.services.SecurityRealmServiceUsingShiro +
-****
-
-.Dependencies
+|.Dependencies
 ****
 org.apache.isis.core:isis-core-runtime:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-api:jar:2.0.0-SNAPSHOT +
+org.apache.isis.extensions:isis-extensions-secman-applib:jar:2.0.0-SNAPSHOT +
 org.apache.isis.security:isis-security-shiro:jar:<managed> +
 ****
 
 .Document Index Entries
 ****
-xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc[IsisModuleExtSecmanRealmShiro], xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc[IsisModuleExtSecmanShiroRealm], xref:refguide:extensions:index/secman/shiro/services/SecurityRealmServiceUsingShiro.adoc[SecurityRealmServiceUsingShiro], xref:refguide:extensions:index/secman/shiro/util/ShiroUtils.adoc[ShiroUtils]
+xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanRealmShiro.adoc[IsisModuleExtSecmanRealmShiro], xref:refguide:extensions:index/secman/shiro/IsisModuleExtSecmanShiroRealm.adoc[IsisModuleExtSecmanShiroRealm], xref:refguide:extensions:index/secman/shiro/util/ShiroUtils.adoc[ShiroUtils]
 ****
 
 |Apache Isis Ext - Security - Shiro LDAP Realm (parent)
@@ -5694,7 +5907,7 @@ Directory: /regressiontests
 ****
 org.apache.directory.server:apacheds-test-framework:jar:2.0.0.AM26 +
 org.apache.isis.extensions:isis-extensions-secman-encryption-jbcrypt:jar:<managed> +
-org.apache.isis.extensions:isis-extensions-secman-model:jar:<managed> +
+org.apache.isis.extensions:isis-extensions-secman-integration:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-persistence-jdo:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-secman-shiro-realm:jar:<managed> +
 org.apache.isis.extensions:isis-extensions-shiro-realm-ldap-impl:jar:<managed> +
@@ -5724,7 +5937,24 @@ Artifact: isis-regressiontests-stable
 Type: jar
 Directory: /regressiontests/stable
 ----
-|.Dependencies
+|.Components
+****
+o.a.i.testdomain.applayer.ApplicationLayerTestFactory +
+o.a.i.testdomain.applayer.ApplicationLayerTestFactory$PreCommitListener +
+o.a.i.testdomain.applayer.publishing.CommandSubscriberForTesting +
+o.a.i.testdomain.applayer.publishing.EntityChangesSubscriberForTesting +
+o.a.i.testdomain.applayer.publishing.EntityPropertyChangeSubscriberForTesting +
+o.a.i.testdomain.applayer.publishing.ExecutionSubscriberForTesting +
+o.a.i.testdomain.conf.Configuration_headless$HeadlessCommandSupport +
+o.a.i.testdomain.jdo.JdoInventoryDao +
+o.a.i.testdomain.jpa.JpaInventoryDao +
+o.a.i.testdomain.jpa.springdata.EmployeeRepository +
+o.a.i.testdomain.util.interaction.InteractionBoundaryProbe +
+o.a.i.testdomain.util.kv.KVStoreForTesting +
+o.a.i.testdomain.util.rest.RestEndpointService +
+****
+
+.Dependencies
 ****
 org.apache.isis.extensions:isis-extensions-cors-impl:jar:<managed> +
 org.glassfish.jersey.ext:jersey-spring5:jar:<managed> +
@@ -6070,7 +6300,30 @@ Artifact: isis-viewer-javafx-ui
 Type: jar
 Directory: /incubator/viewers/javafx/ui
 ----
-|.Dependencies
+|.Components
+****
+o.a.i.incubator.viewer.javafx.ui.components.UiComponentFactoryFx +
+o.a.i.incubator.viewer.javafx.ui.components.markup.MarkupFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.number.NumberFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.objectref.ObjectReferenceFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.other.FallbackFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.temporal.TemporalFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.components.text.TextFieldFactory +
+o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForButton +
+o.a.i.incubator.viewer.javafx.ui.decorator.disabling.DisablingDecoratorForFormField +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForLabeled +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconDecoratorForMenuItem +
+o.a.i.incubator.viewer.javafx.ui.decorator.icon.IconServiceDefault +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForButton +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingDecoratorForFormField +
+o.a.i.incubator.viewer.javafx.ui.decorator.prototyping.PrototypingInfoPopupProvider +
+o.a.i.incubator.viewer.javafx.ui.main.MainViewFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiActionHandlerFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiBuilderFx +
+o.a.i.incubator.viewer.javafx.ui.main.UiContextFxDefault +
+****
+
+.Dependencies
 ****
 org.apache.isis.core:isis-core-runtimeservices:jar:<managed> +
 org.apache.isis.incubator.viewer:isis-viewer-javafx-model:jar:<managed> +
@@ -6184,7 +6437,23 @@ Artifact: isis-viewer-vaadin-ui
 Type: jar
 Directory: /incubator/viewers/vaadin/ui
 ----
-|.Dependencies
+|.Components
+****
+o.a.i.incubator.viewer.vaadin.ui.auth.LogoutHandlerVaa +
+o.a.i.incubator.viewer.vaadin.ui.auth.VaadinAuthenticationHandler +
+o.a.i.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa +
+o.a.i.incubator.viewer.vaadin.ui.components.blob.BlobFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.clob.ClobFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.markup.MarkupFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.other.FallbackFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.temporal.TemporalFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.text.TextFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.components.text.uuid.UuidFieldFactory +
+o.a.i.incubator.viewer.vaadin.ui.pages.main.UiActionHandlerVaa +
+o.a.i.incubator.viewer.vaadin.ui.pages.main.UiContextVaaDefault +
+****
+
+.Dependencies
 ****
 com.vaadin:vaadin-spring:jar:<managed> +
 commons-fileupload:commons-fileupload:jar:1.4 +
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc
index d95c383..daaa5d7 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.core.meta-model.validator.adoc
@@ -40,7 +40,7 @@ isis.core.meta-model.validator. +
 ensure-unique-object-types
 
 |  true
-| Whether to ensure that the object type of all objects (which can be set either explicitly using ``DomainObject#objectType()`` or ``DomainService#objectType()``, or can be inferred implicitly using a variety of mechanisms) must be unique with respect to all other object types.
+| Whether to ensure that the object type of all objects (which can be set either explicitly using ``DomainObject#logicalTypeName()`` or ``DomainService#logicalTypeName()``, or can be inferred implicitly using a variety of mechanisms) must be unique with respect to all other object types.
 
 It is _highly advisable_ to leave this set as enabled (the default), and to also use explicit types (see ``#isExplicitObjectType()``.
 
@@ -51,7 +51,7 @@ isis.core.meta-model.validator. +
 explicit-object-type
 
 | 
-| Whether to ensure that the object type of all objects must be specified explicitly, using either ``DomainObject#objectType()`` or ``DomainService#objectType()``.
+| Whether to ensure that the object type of all objects must be specified explicitly, using either ``DomainObject#logicalTypeName()`` or ``DomainService#logicalTypeName()``.
 
 It is _highly advisable_ to leave this set as enabled (the default). These object types should also (of course) be unique - that can be checked by setting the ``#isEnsureUniqueObjectTypes()`` config property.
 
diff --git a/core/metamodel/src/main/adoc/modules/metamodel/pages/class-diagram.adoc b/core/metamodel/src/main/adoc/modules/metamodel/pages/class-diagram.adoc
index 42f95d0..ecf7d55 100644
--- a/core/metamodel/src/main/adoc/modules/metamodel/pages/class-diagram.adoc
+++ b/core/metamodel/src/main/adoc/modules/metamodel/pages/class-diagram.adoc
@@ -96,7 +96,7 @@ Oid -right-> Object\nSpecId
 where in the `metamodel` package:
 
 `ObjectSpecification`:: is equivalent to `java.lang.Class`
-`ObjectSpecId`:: is a value object equivalent to the `@DomainObject#objectType` or `@DomainService#objectType` attribute
+`ObjectSpecId`:: is a value object equivalent to the `@DomainObject#logicalTypeName` or `@DomainService#logicalTypeName` attribute
 `OneToOneAssociation`:: represents a scalar property
 `OneToManyAssociation`:: represents a collection
 `ObjectAction`:: represents an action (with multiple parameters, either scalar or list)
diff --git a/extensions/security/secman/adoc/modules/secman/pages/about.adoc b/extensions/security/secman/adoc/modules/secman/pages/about.adoc
index 405a89c..63b3133 100644
--- a/extensions/security/secman/adoc/modules/secman/pages/about.adoc
+++ b/extensions/security/secman/adoc/modules/secman/pages/about.adoc
@@ -36,11 +36,11 @@ for example `myapp.customer.CustomerAddress#zipCode`
 * next up is an object feature representing an entire type
 +
 for example `myapp.customer.CustomerAddress`.
-This is usually specified using xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[@DomainObject#objectType()]
+This is usually specified using xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[@DomainObject#logicalTypeName()]
 
 * most general is an object feature representing a namespace
 +
-These consist of the portion of the xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[object type] up to but excluding the local type name, for example `myapp.customer`.
+These consist of the portion of the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical type name] up to but excluding the local type name, for example `myapp.customer`.
 
 Permissions are inferred: a permission granted at the type level implies a permission to all the object members of the type, and a permission granted to a namespace implies a permission to all the object members of all the object types within that namespace.
 
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
index 0c1c186..d7b04c3 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -7,7 +7,7 @@
 In the same way that Java packages act as a namespace for domain objects, it's good practice to map domain entities to their own (database) schemas.
 (For more on database schemas, see for example link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[here]).
 
-We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[object type] also follows the same pattern.
+We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[object type] also follows the same pattern.
 
 For example, xref:security:secman:about.adoc[SecMan]' JDO implementation resides in the `IsisModuleExtSecmanPersistenceJpa` module.
 Its `ApplicationUser` entity is defined as:
diff --git a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
index e27353e..56c0be9 100644
--- a/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
+++ b/persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc
@@ -60,7 +60,7 @@ It is also possible to programmatically define a `DataSource`; see the link:http
 == Create Schema
 
 It's good practice to use link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[SQL schemas] as a way to organise database tables into groups.
-We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[object type] also follows the same pattern.
+We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical type name] also follows the same pattern.
 
 For example:
 
@@ -71,7 +71,7 @@ For example:
     schema="SIMPLE",                                // <.>
     ...
 )
-@DomainObject(objectType = "simple.SimpleObject")   // <.>
+@DomainObject(logicalTypeName = "simple.SimpleObject")   // <.>
 ...
 public class SimpleObject ... {
 
diff --git a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
index 200ab3b..1716312 100644
--- a/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
+++ b/persistence/jpa/adoc/modules/ROOT/pages/db-schemas.adoc
@@ -7,7 +7,7 @@
 In the same way that Java packages act as a namespace for domain objects, it's good practice to map domain entities to their own (database) schemas.
 (For more on database schemas, see for example link:https://crate.io/docs/sql-99/en/latest/chapters/17.html#create-schema-statement[here]).
 
-We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#objectType[object type] also follows the same pattern.
+We recommend all the entities within a module use the same schema, and moreover that the xref:refguide:applib:index/annotation/DomainObject.adoc#logicalTypeName[logical type name] also follows the same pattern.
 
 For example, xref:security:secman:about.adoc[SecMan]' JPA implementation resides in the `IsisModuleExtSecmanPersistenceJpa` module.
 Its `ApplicationUser` entity is defined as:
diff --git a/starters/adoc/modules/starters/pages/simpleapp.adoc b/starters/adoc/modules/starters/pages/simpleapp.adoc
index 33d9819..6f15582 100644
--- a/starters/adoc/modules/starters/pages/simpleapp.adoc
+++ b/starters/adoc/modules/starters/pages/simpleapp.adoc
@@ -93,7 +93,7 @@ This is a view model annotated with xref:refguide:applib:index/annotation/HomePa
 ----
 @DomainObject(
         nature = Nature.VIEW_MODEL,
-        objectType = "domainapp.HomePageViewModel"
+        logicalTypeName = "domainapp.HomePageViewModel"
         )
 @HomePage
 public class HomePageViewModel {
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
index 6b2a7e1..01530cf 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/troubleshooting.adoc
@@ -52,7 +52,7 @@ Add `@XmlAccessorType(XmlAccessType.FIELD)` to your domain entity:
 @javax.jdo.annotations.PersistenceCapable(identityType = IdentityType.DATASTORE)
 @javax.jdo.annotations.DatastoreIdentity(strategy = javax.jdo.annotations.IdGeneratorStrategy.NATIVE, column = "id")
 @javax.jdo.annotations.Version(strategy = VersionStrategy.VERSION_NUMBER, column = "version")
-@DomainObject(objectType = "ServiceName", bounded = true)
+@DomainObject(logicalTypeName = "ServiceName", bounded = true)
 @DomainObjectLayout(cssClassFa = "tag", describedAs = "")
 @XmlAccessorType(XmlAccessType.FIELD)
 @SuppressWarnings("javadoc")
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
index 5e8e2f3..2925d56 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/hints-and-tips/view-model-as-parameter.adoc
@@ -17,7 +17,7 @@ My view model parameter would look like
 ----
 @DomainObject(
     nature = Nature.VIEW_MODEL,
-    objectType = "OfferTemplateFilter"
+    logicalTypeName = "OfferTemplateFilter"
 )
 @XmlRootElement(name = "OfferTemplateFilter")
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -35,7 +35,7 @@ My REST domain service would be someting like
 
 @DomainService(
     nature = NatureOfService.VIEW_REST_ONLY,
-    objectType = "OfferRestService"
+    logicalTypeName = "OfferRestService"
 )
 public class OfferRestService {