You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/23 06:34:13 UTC

[causeway] 01/01: CAUSEWAY-2646: batch chancge of all layout namespaces bs3->bs (non invasive)

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

ahuber pushed a commit to branch 2646-rename.bs3.to.bs
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 1c64d20820d063e03c8fd822bcb6d2160360c5d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 23 08:34:08 2023 +0200

    CAUSEWAY-2646: batch chancge of all layout namespaces bs3->bs (non
    invasive)
---
 ...ApplicationFeatureViewModel.layout.fallback.xml | 208 ++++++++++-----------
 .../ConfigurationProperty.layout.fallback.xml      |  58 +++---
 .../ConfigurationViewmodel.layout.fallback.xml     |  94 +++++-----
 .../services/user/RoleMemento.layout.fallback.xml  |  36 ++--
 .../services/user/UserMemento.layout.fallback.xml  | 116 ++++++------
 .../core/metamodel/services/grid/Bar.layout.xml    |  22 +--
 .../core/metamodel/services/grid/Foo.layout.xml    |  10 +-
 .../services/grid/Foo2.layout.fallback.xml         |  10 +-
 .../services/grid/Foo3.layout.fallback.xml         |  10 +-
 .../core/metamodel/services/grid/Foo3.layout.xml   |  10 +-
 .../applib/dom/CommandLogEntry.layout.fallback.xml | 128 ++++++-------
 .../docgen/helptree/HelpNodeVm.layout.fallback.xml |  36 ++--
 .../BulkUpdateLineItemForDemoToDoItem.layout.xml   |  22 +--
 .../BulkUpdateManagerForDemoToDoItem.layout.xml    |  24 +--
 .../todomodule/dom/ExcelDemoToDoItem.layout.xml    |  50 ++---
 .../dom/ExecutionLogEntry.layout.fallback.xml      | 132 ++++++-------
 .../dom/ExecutionOutboxEntry.layout.fallback.xml   | 128 ++++++-------
 .../applib/dom/AuditTrailEntry.layout.fallback.xml | 144 +++++++-------
 ...onOrphanedPermissionManager.layout.fallback.xml |  40 ++--
 .../dom/ApplicationPermission.layout.fallback.xml  |  96 +++++-----
 .../role/dom/ApplicationRole.layout.fallback.xml   |  76 ++++----
 .../man/ApplicationRoleManager.layout.fallback.xml |  80 ++++----
 .../dom/ApplicationTenancy.layout.fallback.xml     |  76 ++++----
 .../ApplicationTenancyManager.layout.fallback.xml  |  80 ++++----
 .../user/dom/ApplicationUser.layout.fallback.xml   | 134 ++++++-------
 .../UserPermissionViewModel.layout.fallback.xml    |  92 ++++-----
 .../man/ApplicationUserManager.layout.fallback.xml |  80 ++++----
 .../applib/dom/SessionLogEntry.layout.fallback.xml |  84 ++++-----
 .../layouts/integtest/model/Counter.layout.xml     |  92 ++++-----
 .../integtest/model/SimpleObject.layout.xml        |  80 ++++----
 .../testdomain/jdo/JdoInventoryJaxbVm.layout.xml   |  56 +++---
 .../testdomain/jpa/JpaInventoryJaxbVm.layout.xml   |  56 +++---
 .../applib/fixturescripts/FixtureResult.layout.xml |  28 +--
 .../src/main/resources/$Templates.layout.xml       |  48 ++---
 .../persistence/$TemplateEntity.layout.xml         |  36 ++--
 .../$TemplateEntity~primitive.layout.xml           |  36 ++--
 .../src/main/resources/vm/$TemplateVm.layout.xml   |  36 ++--
 .../resources/vm/$TemplateVm~primitive.layout.xml  |  36 ++--
 38 files changed, 1290 insertions(+), 1290 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.layout.fallback.xml b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.layout.fallback.xml
index 3180ba79a2..437984944e 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/appfeatui/ApplicationFeatureViewModel.layout.fallback.xml
@@ -17,123 +17,123 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Detail">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Detail">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Detail" id="detail"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Data type">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Data type">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Data Type" id="dataType"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Contributed">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Contributed">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Contributed" id="contributed"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="4">
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Hierarchy">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="4">
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Hierarchy">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Parent" id="parent"/>
-                        </bs3:col>
-                    </bs3:row>
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="contents"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="4">
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Permissions">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="4">
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Permissions">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="permissions"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="Actions">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="Actions">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="actions"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Properties">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Properties">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="properties"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Collections">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Collections">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="collections"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.layout.fallback.xml b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.layout.fallback.xml
index 2cf0484d15..b2b48e2f7a 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationProperty.layout.fallback.xml
@@ -17,41 +17,41 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
             <cpt:action hidden="EVERYWHERE" id="clearHints"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="General">
-                    <bs3:row>
-                        <bs3:col span="8">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="General">
+                    <bs:row>
+                        <bs:col span="8">
                             <cpt:fieldSet name="Property" id="key">
                                 <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
                                 <cpt:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
                                 <cpt:property id="key"/>
                                 <cpt:property id="value" multiLine="5"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml
index 8a571f5e39..e16922f9df 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/confview/ConfigurationViewmodel.layout.fallback.xml
@@ -9,58 +9,58 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
 	OF ANY KIND, either express or implied. See the License for the specific 
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
 	xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
 	xmlns:cpt="https://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<bs3:row>
-		<bs3:col span="12" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="12" unreferencedActions="true">
 			<cpt:domainObject />
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup unreferencedCollections="true">
-				<bs3:tab name="Environment">
-					<bs3:row>
-						<bs3:col span="12" size="MD" />
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Configuration">
-					<bs3:row>
-						<bs3:col span="12" size="MD" />
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup>
-				<bs3:tab name="Identity">
-					<bs3:row>
-						<bs3:col span="12">
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup unreferencedCollections="true">
+				<bs:tab name="Environment">
+					<bs:row>
+						<bs:col span="12" size="MD" />
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Configuration">
+					<bs:row>
+						<bs:col span="12" size="MD" />
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup>
+				<bs:tab name="Identity">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Identity" id="identity" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Other">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Other">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Other" id="other"
 								unreferencedProperties="true" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Metadata">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Metadata">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Metadata" id="metadata" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-</bs3:grid>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+</bs:grid>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.layout.fallback.xml b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.layout.fallback.xml
index 982dc141b6..e97cf8b472 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.layout.fallback.xml
@@ -17,28 +17,28 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
             <cpt:fieldSet name="Identity" id="identity"/>
             <cpt:fieldSet name="Details" id="details"/>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-        <bs3:col span="6">
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+        <bs:col span="6">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.layout.fallback.xml b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.layout.fallback.xml
index 22b9478fe2..154851d29f 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.layout.fallback.xml
@@ -17,72 +17,72 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-            <bs3:tabGroup>
-                <bs3:tab name="Details">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+            <bs:tabGroup>
+                <bs:tab name="Details">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="" id="details"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Regional">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Regional">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="" id="regional"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Security">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Security">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="" id="security"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="6">
             <cpt:collection id="roles"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Bar.layout.xml b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Bar.layout.xml
index 3502b7f6c1..312c8ca9f7 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Bar.layout.xml
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Bar.layout.xml
@@ -17,19 +17,19 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
             <cpt:action id="createSimpleObject">
             	<cpt:named>Hello</cpt:named>
             </cpt:action>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="General" unreferencedProperties="true"/>
-        </bs3:col>
-        <bs3:col span="12" unreferencedCollections="true"/>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+        <bs:col span="12" unreferencedCollections="true"/>
+    </bs:row>
+</bs:grid>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo.layout.xml b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo.layout.xml
index 26f6d829e1..6384731664 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo.layout.xml
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo.layout.xml
@@ -17,10 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-    </bs3:row>
-</bs3:grid>
+    <bs:row>
+    </bs:row>
+</bs:grid>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo2.layout.fallback.xml b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo2.layout.fallback.xml
index 26f6d829e1..6384731664 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo2.layout.fallback.xml
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo2.layout.fallback.xml
@@ -17,10 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-    </bs3:row>
-</bs3:grid>
+    <bs:row>
+    </bs:row>
+</bs:grid>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.fallback.xml b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.fallback.xml
index 26f6d829e1..6384731664 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.fallback.xml
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.fallback.xml
@@ -17,10 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-    </bs3:row>
-</bs3:grid>
+    <bs:row>
+    </bs:row>
+</bs:grid>
diff --git a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.xml b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.xml
index 26f6d829e1..6384731664 100644
--- a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.xml
+++ b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/services/grid/Foo3.layout.xml
@@ -17,10 +17,10 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-    </bs3:row>
-</bs3:grid>
+    <bs:row>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.layout.fallback.xml b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.layout.fallback.xml
index 7532e6c7da..30f7fbfbaa 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.layout.fallback.xml
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/causeway/extensions/commandlog/applib/dom/CommandLogEntry.layout.fallback.xml
@@ -19,33 +19,33 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="3">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="3">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity">
                                 <cpt:property id="interactionId"/>
                                 <cpt:property id="type"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Target" id="target">
                 <cpt:property id="target"/>
                 <cpt:property id="targetLogicalTypeName">
@@ -61,13 +61,13 @@
                 </cpt:property>
                 <cpt:property id="timestamp"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="6">
+        </bs:col>
+        <bs:col span="6">
             <cpt:fieldSet name="Command DTO" id="commandDto">
                 <cpt:property id="commandDto" multiLine="30" labelPosition="TOP"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="3">
+        </bs:col>
+        <bs:col span="3">
             <cpt:fieldSet name="Execution" id="execution">
                 <cpt:action id="retry" cssClassFa="fa-repeat" cssClass="btn-warning"/>
                 <cpt:action id="exclude" cssClassFa="fa-ban" cssClass="btn-warning"/>
@@ -88,48 +88,48 @@
                 <cpt:property id="exception" labelPosition="TOP"/>
             </cpt:fieldSet>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="Related Commands">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="Related Commands">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="childCommands"/>
                             <cpt:collection id="siblingCommands"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Execution Log Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Execution Log Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="executionLogEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Audit Trail Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Audit Trail Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="auditTrailEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="User Activity">
-                    <bs3:row>
-                        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="User Activity">
+                    <bs:row>
+                        <bs:col span="6">
                             <cpt:collection id="recentCommandsByUser"/>
-                        </bs3:col>
-                        <bs3:col span="6">
+                        </bs:col>
+                        <bs:col span="6">
                             <cpt:collection id="recentExecutionsByUser"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true">
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true">
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/helptree/HelpNodeVm.layout.fallback.xml b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/helptree/HelpNodeVm.layout.fallback.xml
index d2848616aa..d39805b83a 100644
--- a/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/helptree/HelpNodeVm.layout.fallback.xml
+++ b/extensions/core/docgen/src/main/java/org/apache/causeway/extensions/docgen/helptree/HelpNodeVm.layout.fallback.xml
@@ -9,23 +9,23 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <bs3:row>
-        <bs3:col span="10" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="10" unreferencedActions="true">
             <cpt:domainObject />
-        </bs3:col>
-        <bs3:col span="2">
+        </bs:col>
+        <bs:col span="2">
             <cpt:fieldSet name="" id="sources" />
-        </bs3:col>
-    </bs3:row>
+        </bs:col>
+    </bs:row>
 
-    <bs3:row>
-        <bs3:col span="3">
+    <bs:row>
+        <bs:col span="3">
             <cpt:fieldSet name="Index" id="tree">
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -40,14 +40,14 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
             </cpt:fieldSet>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-        <bs3:col span="9">
+        </bs:col>
+        <bs:col span="9">
             <cpt:fieldSet name="Detail" id="detail">
                 <cpt:property id="helpNode"/>
             </cpt:fieldSet>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true"/>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true"/>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
index f5bd0d2b6b..d65abc830d 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml
@@ -17,15 +17,15 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
             <cpt:action id="apply"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="General" id="general" unreferencedProperties="true">
                 <cpt:action id="clearHints"/>
                 <cpt:action id="downloadLayoutXml"/>
@@ -40,7 +40,7 @@ under the License.
                 <cpt:property id="dueBy"/>
                 <cpt:property id="cost"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="8" unreferencedCollections="true"/>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+        <bs:col span="8" unreferencedCollections="true"/>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
index 1ffc466b9c..fb72393806 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml
@@ -17,15 +17,15 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject>
             </cpt:domainObject>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="File" id="file" unreferencedProperties="true">
                 <cpt:action id="clearHints" position="PANEL_DROPDOWN"/>
                 <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
@@ -45,12 +45,12 @@ under the License.
                     </cpt:action>
                 </cpt:property>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="8" unreferencedCollections="true">
+        </bs:col>
+        <bs:col span="8" unreferencedCollections="true">
             <cpt:collection id="toDoItems" defaultView="table">
                 <cpt:action id="export"/>
                 <cpt:action id="import"/>
             </cpt:collection>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
index aa9aa27285..d3b07e9f64 100644
--- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
+++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml
@@ -17,9 +17,9 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
             <cpt:action id="delete"/>
             <cpt:action id="export">
@@ -30,10 +30,10 @@ under the License.
                 <cpt:named>Export current and all</cpt:named>
                 <cpt:describedAs>Export current as single row in spreadsheet, and all on a separate sheet</cpt:describedAs>
             </cpt:action>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="General" id="general">
                 <cpt:property id="description"/>
                 <cpt:property id="category"/>
@@ -54,10 +54,10 @@ under the License.
                 <cpt:property id="datanucleusIdLong"/>
             </cpt:fieldSet>
 
-        </bs3:col>
-        <bs3:col span="8">
-            <bs3:row>
-                <bs3:col span="6">
+        </bs:col>
+        <bs:col span="8">
+            <bs:row>
+                <bs:col span="6">
                     <cpt:fieldSet name="Priority" id="priority">
                         <cpt:property id="dueBy"/>
                     </cpt:fieldSet>
@@ -67,26 +67,26 @@ under the License.
                         </cpt:property>
                         <cpt:property id="previousCost"/>
                     </cpt:fieldSet>
-                </bs3:col>
-                <bs3:col span="6">
+                </bs:col>
+                <bs:col span="6">
                     <cpt:fieldSet name="Other" id="other" unreferencedProperties="true">
                         <cpt:property id="notes"/>
                         <cpt:property id="attachment"/>
                     </cpt:fieldSet>
-                </bs3:col>
-            </bs3:row>
-            <bs3:row>
-                <bs3:col span="12">
+                </bs:col>
+            </bs:row>
+            <bs:row>
+                <bs:col span="12">
                     <cpt:collection id="dependencies" defaultView="table">
                         <cpt:action id="add"/>
                         <cpt:action id="remove"/>
                     </cpt:collection>
-                </bs3:col>
-            </bs3:row>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true"/>
-    </bs3:row>
+                </bs:col>
+            </bs:row>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true"/>
+    </bs:row>
 
-</bs3:grid>
+</bs:grid>
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.layout.fallback.xml b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.layout.fallback.xml
index 8205c55b9a..4436a83b0c 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.layout.fallback.xml
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/causeway/extensions/executionlog/applib/dom/ExecutionLogEntry.layout.fallback.xml
@@ -19,18 +19,18 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="3">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="3">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity">
                                 <cpt:property id="interactionId">
                                     <!-- if executionoutbox module included -->
@@ -39,17 +39,17 @@
                                 <cpt:property id="sequence"/>
                                 <cpt:property id="type"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Target" id="target">
                 <cpt:property id="target"/>
                 <cpt:property id="targetLogicalTypeName">
@@ -66,65 +66,65 @@
                 </cpt:property>
                 <cpt:property id="timestamp"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="6">
+        </bs:col>
+        <bs:col span="6">
             <cpt:fieldSet name="Interaction DTO" id="interactionDto">
                 <cpt:property id="interactionDto" multiLine="30" labelPosition="TOP"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="3">
+        </bs:col>
+        <bs:col span="3">
             <cpt:fieldSet name="Timings" id="timings">
                 <cpt:property id="startedAt"/>
                 <cpt:property id="completedAt"/>
                 <cpt:property id="duration"/>
             </cpt:fieldSet>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="Related Command">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="Related Command">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Related Command">
                                 <cpt:property id="commandLogEntry"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Execution Log Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Execution Log Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="siblingExecutions"/>
-                        </bs3:col>
-                        <bs3:col span="0">
+                        </bs:col>
+                        <bs:col span="0">
                             <cpt:collection id="executionLogEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Audit Trail Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Audit Trail Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="auditTrailEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="User Activity">
-                    <bs3:row>
-                        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="User Activity">
+                    <bs:row>
+                        <bs:col span="6">
                             <cpt:collection id="recentCommandsByUser"/>
-                        </bs3:col>
-                        <bs3:col span="6">
+                        </bs:col>
+                        <bs:col span="6">
                             <cpt:collection id="recentExecutionsByUser"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true">
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true">
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.layout.fallback.xml b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.layout.fallback.xml
index a20d912d08..a0c7971a99 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.layout.fallback.xml
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/causeway/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.layout.fallback.xml
@@ -19,34 +19,34 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="3">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="3">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity">
                                 <cpt:property id="interactionId"/>
                                 <cpt:property id="sequence"/>
                                 <cpt:property id="type"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Target" id="target">
                 <cpt:property id="target"/>
                 <cpt:property id="targetLogicalTypeName">
@@ -61,62 +61,62 @@
                 <cpt:property id="username"/>
                 <cpt:property id="timestamp"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="6">
+        </bs:col>
+        <bs:col span="6">
             <cpt:fieldSet name="Interaction DTO" id="interactionDto">
                 <cpt:property id="interactionDto" multiLine="30" labelPosition="TOP"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="3">
+        </bs:col>
+        <bs:col span="3">
             <cpt:fieldSet name="Timings" id="timings">
                 <cpt:property id="startedAt"/>
                 <cpt:property id="completedAt"/>
                 <cpt:property id="duration"/>
             </cpt:fieldSet>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="Related Command">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="Related Command">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Related Command">
                                 <cpt:property id="commandLogEntry"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Execution Log Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Execution Log Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="executionLogEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Audit Trail Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Audit Trail Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="auditTrailEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="User Activity">
-                    <bs3:row>
-                        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="User Activity">
+                    <bs:row>
+                        <bs:col span="6">
                             <cpt:collection id="recentCommandsByUser"/>
-                        </bs3:col>
-                        <bs3:col span="6">
+                        </bs:col>
+                        <bs:col span="6">
                             <cpt:collection id="recentExecutionsByUser"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true">
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true">
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.layout.fallback.xml b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.layout.fallback.xml
index 3965cc2bdd..03e77c81e5 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.layout.fallback.xml
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/causeway/extensions/audittrail/applib/dom/AuditTrailEntry.layout.fallback.xml
@@ -19,34 +19,34 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity">
                                 <cpt:property id="interactionId"/>
                                 <cpt:property id="sequence"/>
                                 <cpt:property id="type"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Target" id="target">
                 <cpt:property id="target"/>
                 <cpt:property id="targetLogicalTypeName">
@@ -61,70 +61,70 @@
                 <cpt:property id="username"/>
                 <cpt:property id="timestamp"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="4">
+        </bs:col>
+        <bs:col span="4">
             <cpt:fieldSet name="Change" id="change">
                 <cpt:property id="preValue"/>
                 <cpt:property id="postValue"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="4">
-            <bs3:row>
-                <bs3:col span="12">
+        </bs:col>
+        <bs:col span="4">
+            <bs:row>
+                <bs:col span="12">
                     <!-- we provide this collection twice, for convenience -->
                     <cpt:collection id="auditTrailEntries">
                         <cpt:named>All changes</cpt:named>
                     </cpt:collection>
-                </bs3:col>
-            </bs3:row>
-            <bs3:row>
-                <bs3:col span="12">
+                </bs:col>
+            </bs:row>
+            <bs:row>
+                <bs:col span="12">
                     <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                </bs3:col>
-            </bs3:row>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup>
-                <bs3:tab name="Related Command">
-                    <bs3:row>
-                        <bs3:col span="12">
+                </bs:col>
+            </bs:row>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup>
+                <bs:tab name="Related Command">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Related Command">
                                 <cpt:property id="commandLogEntry"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Execution Log Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Execution Log Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="executionLogEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Related Audit Trail Entries">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Related Audit Trail Entries">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:collection id="auditTrailEntries"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="User Activity">
-                    <bs3:row>
-                        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="User Activity">
+                    <bs:row>
+                        <bs:col span="6">
                             <cpt:collection id="recentCommandsByUser"/>
-                        </bs3:col>
-                        <bs3:col span="6">
+                        </bs:col>
+                        <bs:col span="6">
                             <cpt:collection id="recentExecutionsByUser"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12" unreferencedCollections="true">
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12" unreferencedCollections="true">
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml
index 415414ec62..fccc0f7172 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.layout.fallback.xml
@@ -17,30 +17,30 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
             <cpt:collection id="orphanedCollections"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
             <cpt:fieldSet name="Metadata" id="metadata"/>
             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.layout.fallback.xml
index 99032525a8..8a44108734 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.layout.fallback.xml
@@ -17,60 +17,60 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="6">
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Permissions">
-                    <bs3:row>
-                        <bs3:col span="6">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="6">
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Permissions">
+                    <bs:row>
+                        <bs:col span="6">
                             <cpt:fieldSet name="Rule" id="rule"/>
-                        </bs3:col>
-                        <bs3:col span="6">
+                        </bs:col>
+                        <bs:col span="6">
                             <cpt:fieldSet name="Mode" id="mode"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRole.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRole.layout.fallback.xml
index edcbd051a5..76c8869a62 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRole.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRole.layout.fallback.xml
@@ -17,51 +17,51 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Details" id="details"/>
-        </bs3:col>
-        <bs3:col span="8">
+        </bs:col>
+        <bs:col span="8">
             <cpt:collection id="permissions"/>
             <cpt:collection id="users"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/man/ApplicationRoleManager.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/man/ApplicationRoleManager.layout.fallback.xml
index 83bc031e77..48e64a221c 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/man/ApplicationRoleManager.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/role/man/ApplicationRoleManager.layout.fallback.xml
@@ -9,51 +9,51 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
 	xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
 	xmlns:cpt="https://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:domainObject />
-		</bs3:col>
-		<bs3:col span="6" unreferencedActions="true">
-			<bs3:tabGroup>
-				<bs3:tab name="Identity">
-					<bs3:row>
-						<bs3:col span="12">
+		</bs:col>
+		<bs:col span="6" unreferencedActions="true">
+			<bs:tabGroup>
+				<bs:tab name="Identity">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Identity" id="identity" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Other">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Other">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Other" id="other"
 								unreferencedProperties="true" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Metadata">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Metadata">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Metadata" id="metadata" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup unreferencedCollections="true">
-				<bs3:tab name="All Roles">
-					<bs3:row>
-						<bs3:col span="12" size="MD" />
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-</bs3:grid>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup unreferencedCollections="true">
+				<bs:tab name="All Roles">
+					<bs:row>
+						<bs:col span="12" size="MD" />
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancy.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancy.layout.fallback.xml
index 45d3b4d36b..9b1783839e 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancy.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/dom/ApplicationTenancy.layout.fallback.xml
@@ -17,51 +17,51 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
             <cpt:fieldSet name="Details" id="details"/>
-        </bs3:col>
-        <bs3:col span="8">
+        </bs:col>
+        <bs:col span="8">
             <cpt:collection id="children"/>
             <cpt:collection id="users"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/man/ApplicationTenancyManager.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/man/ApplicationTenancyManager.layout.fallback.xml
index 782a9c8824..1eb4e1aeab 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/man/ApplicationTenancyManager.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/tenancy/man/ApplicationTenancyManager.layout.fallback.xml
@@ -9,51 +9,51 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
 	xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
 	xmlns:cpt="https://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:domainObject />
-		</bs3:col>
-		<bs3:col span="6" unreferencedActions="true">
-			<bs3:tabGroup>
-				<bs3:tab name="Identity">
-					<bs3:row>
-						<bs3:col span="12">
+		</bs:col>
+		<bs:col span="6" unreferencedActions="true">
+			<bs:tabGroup>
+				<bs:tab name="Identity">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Identity" id="identity" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Other">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Other">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Other" id="other"
 								unreferencedProperties="true" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Metadata">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Metadata">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Metadata" id="metadata" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup unreferencedCollections="true">
-				<bs3:tab name="All Tenancies">
-					<bs3:row>
-						<bs3:col span="12" size="MD" />
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
-</bs3:grid>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup unreferencedCollections="true">
+				<bs:tab name="All Tenancies">
+					<bs:row>
+						<bs:col span="12" size="MD" />
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.layout.fallback.xml
index 751a9ad51f..257dc63cd8 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/ApplicationUser.layout.fallback.xml
@@ -17,80 +17,80 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-			<bs3:tabGroup>
-				<bs3:tab name="Identity">
-					<bs3:row>
-						<bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+			<bs:tabGroup>
+				<bs:tab name="Identity">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Identity" id="identity"/>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Regional">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Regional">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Regional Settings" id="regional"/>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Other">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Other">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Metadata">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Metadata">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Metadata" id="metadata"/>
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
             <cpt:fieldSet name="Access" id="access"/>
-        </bs3:col>
-        <bs3:col span="8">
-			<bs3:row>
-				<bs3:col span="6">
+        </bs:col>
+        <bs:col span="8">
+			<bs:row>
+				<bs:col span="6">
 					<cpt:fieldSet name="Contact Details" id="contactDetails"/>
-				</bs3:col>
-				<bs3:col span="6">
+				</bs:col>
+				<bs:col span="6">
 					<cpt:fieldSet name="Name" id="name"/>
-				</bs3:col>
-			</bs3:row>
-        	<bs3:row>
-        		<bs3:col span="12">
-        			<bs3:tabGroup>
-		        		<bs3:tab name="Roles">
-		        			<bs3:row>
-		        				<bs3:col span="12">
+				</bs:col>
+			</bs:row>
+        	<bs:row>
+        		<bs:col span="12">
+        			<bs:tabGroup>
+		        		<bs:tab name="Roles">
+		        			<bs:row>
+		        				<bs:col span="12">
 						            <cpt:collection id="roles"/>
-		        				</bs3:col>
-		        			</bs3:row>
-		        		</bs3:tab>
-		        		<bs3:tab name="Permissions">
-		        			<bs3:row>
-		        				<bs3:col span="12">
+		        				</bs:col>
+		        			</bs:row>
+		        		</bs:tab>
+		        		<bs:tab name="Permissions">
+		        			<bs:row>
+		        				<bs:col span="12">
 		        					<cpt:collection id="effectiveMemberPermissions"/>
-		        				</bs3:col>
-		        			</bs3:row>
-		        		</bs3:tab>
-        			</bs3:tabGroup>
-        		</bs3:col>
-        	</bs3:row>
-        </bs3:col>
-    </bs3:row>
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup unreferencedCollections="true"/>
-		</bs3:col>
-	</bs3:row>
-</bs3:grid>
+		        				</bs:col>
+		        			</bs:row>
+		        		</bs:tab>
+        			</bs:tabGroup>
+        		</bs:col>
+        	</bs:row>
+        </bs:col>
+    </bs:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup unreferencedCollections="true"/>
+		</bs:col>
+	</bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml
index 4b77f4ddce..f2e86d7617 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/dom/mixins/perms/UserPermissionViewModel.layout.fallback.xml
@@ -17,60 +17,60 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-            <bs3:tabGroup>
-                <bs3:tab name="Identity">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
+            <bs:tabGroup>
+                <bs:tab name="Identity">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="6">
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Cause">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="6">
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Cause">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Cause" id="cause">
                                 <cpt:property id="viewingPermission"/>
                                 <cpt:property id="changingPermission"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="12">
-            <bs3:tabGroup unreferencedCollections="true"/>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="12">
+            <bs:tabGroup unreferencedCollections="true"/>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/ApplicationUserManager.layout.fallback.xml b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/ApplicationUserManager.layout.fallback.xml
index f48f729f77..d065a7d9f7 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/ApplicationUserManager.layout.fallback.xml
+++ b/extensions/security/secman/applib/src/main/java/org/apache/causeway/extensions/secman/applib/user/man/ApplicationUserManager.layout.fallback.xml
@@ -9,53 +9,53 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
 	xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-	xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+	xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
 	xmlns:cpt="https://causeway.apache.org/applib/layout/component"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:domainObject />
-		</bs3:col>
-		<bs3:col span="6" unreferencedActions="true">
-			<bs3:tabGroup>
-				<bs3:tab name="Identity">
-					<bs3:row>
-						<bs3:col span="12">
+		</bs:col>
+		<bs:col span="6" unreferencedActions="true">
+			<bs:tabGroup>
+				<bs:tab name="Identity">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Identity" id="identity" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Other">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Other">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Other" id="other"
 								unreferencedProperties="true" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-				<bs3:tab name="Metadata">
-					<bs3:row>
-						<bs3:col span="12">
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+				<bs:tab name="Metadata">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet name="Metadata" id="metadata" />
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
 	
-	<bs3:row>
-		<bs3:col span="12">
-			<bs3:tabGroup unreferencedCollections="true">
-				<bs3:tab name="All Users">
-					<bs3:row>
-						<bs3:col span="12" size="MD" />
-					</bs3:row>
-				</bs3:tab>
-			</bs3:tabGroup>
-		</bs3:col>
-	</bs3:row>
+	<bs:row>
+		<bs:col span="12">
+			<bs:tabGroup unreferencedCollections="true">
+				<bs:tab name="All Users">
+					<bs:row>
+						<bs:col span="12" size="MD" />
+					</bs:row>
+				</bs:tab>
+			</bs:tabGroup>
+		</bs:col>
+	</bs:row>
 	
-</bs3:grid>
+</bs:grid>
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.layout.fallback.xml b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.layout.fallback.xml
index aca8a84213..a5ec2492d6 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.layout.fallback.xml
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/causeway/extensions/sessionlog/applib/dom/SessionLogEntry.layout.fallback.xml
@@ -19,22 +19,22 @@
   ~
   -->
 
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-            <bs3:tabGroup>
-                <bs3:tab name="Identifier">
-                    <bs3:row>
-                        <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
+            <bs:tabGroup>
+                <bs:tab name="Identifier">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Identity" id="identity">
                                 <cpt:action id="previous"/>
                                 <cpt:action id="next"/>
@@ -47,41 +47,41 @@
                             <cpt:fieldSet name="" id="http-id">
                                 <cpt:property id="sessionGuid"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Other">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Other">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-                <bs3:tab name="Metadata">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+                <bs:tab name="Metadata">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Metadata" id="metadata">
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="6">
-            <bs3:tabGroup collapseIfOne="false">
-                <bs3:tab name="Logout">
-                    <bs3:row>
-                        <bs3:col span="12">
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="6">
+            <bs:tabGroup collapseIfOne="false">
+                <bs:tab name="Logout">
+                    <bs:row>
+                        <bs:col span="12">
                             <cpt:fieldSet name="Timestamps" id="logout">
                                 <cpt:property id="loginTimestamp"/>
                                 <cpt:property id="logoutTimestamp"/>
                                 <cpt:property id="causedBy"/>
                             </cpt:fieldSet>
-                        </bs3:col>
-                    </bs3:row>
-                </bs3:tab>
-            </bs3:tabGroup>
-        </bs3:col>
-        <bs3:col span="12" unreferencedCollections="true"/>
-    </bs3:row>
-</bs3:grid>
+                        </bs:col>
+                    </bs:row>
+                </bs:tab>
+            </bs:tabGroup>
+        </bs:col>
+        <bs:col span="12" unreferencedCollections="true"/>
+    </bs:row>
+</bs:grid>
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
index ee67a9183b..b86db6c888 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
@@ -17,56 +17,56 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="https://causeway.apache.org/applib/layout/component" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="https://causeway.apache.org/applib/layout/component" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <c:domainObject bookmarking="AS_ROOT"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
-            <bs3:row>
-                <bs3:col span="12">
-                    <bs3:tabGroup>
-                        <bs3:tab name="Identity">
-                            <bs3:row>
-                                <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
+            <bs:row>
+                <bs:col span="12">
+                    <bs:tabGroup>
+                        <bs:tab name="Identity">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Identity" id="identity"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                        <bs3:tab name="Other">
-                            <bs3:row>
-                                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                        <bs:tab name="Other">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                        <bs3:tab name="Metadata">
-                            <bs3:row>
-                                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                        <bs:tab name="Metadata">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Metadata" id="metadata"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                    </bs3:tabGroup>
-                </bs3:col>
-            </bs3:row>
-            <bs3:row>
-                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                    </bs:tabGroup>
+                </bs:col>
+            </bs:row>
+            <bs:row>
+                <bs:col span="12">
                     <c:fieldSet name="Details" id="details"/>
-                </bs3:col>
-            </bs3:row>
-            <bs3:row>
-                <bs3:col span="12">
+                </bs:col>
+            </bs:row>
+            <bs:row>
+                <bs:col span="12">
                     <c:fieldSet name="Empty FieldSet" id="empty"/>
-                </bs3:col>
-            </bs3:row>
-        </bs3:col>
-        <bs3:col span="8">
-            <bs3:tabGroup  unreferencedCollections="true">
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                </bs:col>
+            </bs:row>
+        </bs:col>
+        <bs:col span="8">
+            <bs:tabGroup  unreferencedCollections="true">
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
index 441643d463..f1fa02413b 100644
--- a/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
+++ b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
@@ -19,49 +19,49 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="https://causeway.apache.org/applib/layout/component" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="https://causeway.apache.org/applib/layout/component" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <c:domainObject bookmarking="AS_ROOT"/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
-            <bs3:row>
-                <bs3:col span="12">
-                    <bs3:tabGroup>
-                        <bs3:tab name="Identity">
-                            <bs3:row>
-                                <bs3:col span="12">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
+            <bs:row>
+                <bs:col span="12">
+                    <bs:tabGroup>
+                        <bs:tab name="Identity">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Identity" id="identity"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                        <bs3:tab name="Other">
-                            <bs3:row>
-                                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                        <bs:tab name="Other">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                        <bs3:tab name="Metadata">
-                            <bs3:row>
-                                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                        <bs:tab name="Metadata">
+                            <bs:row>
+                                <bs:col span="12">
                                     <c:fieldSet name="Metadata" id="metadata"/>
-                                </bs3:col>
-                            </bs3:row>
-                        </bs3:tab>
-                    </bs3:tabGroup>
-                </bs3:col>
-                <bs3:col span="12">
+                                </bs:col>
+                            </bs:row>
+                        </bs:tab>
+                    </bs:tabGroup>
+                </bs:col>
+                <bs:col span="12">
                     <c:fieldSet name="Details" id="details"/>
-                </bs3:col>
-            </bs3:row>
-        </bs3:col>
-        <bs3:col span="6">
-            <bs3:tabGroup  unreferencedCollections="true">
-            </bs3:tabGroup>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+                </bs:col>
+            </bs:row>
+        </bs:col>
+        <bs:col span="6">
+            <bs:tabGroup  unreferencedCollections="true">
+            </bs:tabGroup>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryJaxbVm.layout.xml b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryJaxbVm.layout.xml
index f8e913229d..a64908e704 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryJaxbVm.layout.xml
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryJaxbVm.layout.xml
@@ -19,30 +19,30 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="General" unreferencedProperties="true">
                 <cpt:property id="name"/>
                 <cpt:property id="favoriteBook" />
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="12" unreferencedCollections="true">
+        </bs:col>
+        <bs:col span="12" unreferencedCollections="true">
             <cpt:collection defaultView="table" id="books" paged="12"/>
-        </bs3:col>
+        </bs:col>
 
-        <bs3:col span="12">
+        <bs:col span="12">
 
-        	<bs3:tabGroup>
+        	<bs:tabGroup>
 
-				<bs3:tab name="Tab 1">
-					<bs3:row>
-						<bs3:col span="12">
+				<bs:tab name="Tab 1">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet id="fs1">
 								<cpt:property id="bookForTab1"/>
 								<cpt:property id="bookNameForTab1"/>
@@ -51,13 +51,13 @@
 							<cpt:collection defaultView="table" id="booksForTab1" paged="12"/>
 							<cpt:collection defaultView="table" id="productsForTab1" paged="12"/>
 
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
 
-				<bs3:tab name="Tab 2">
-					<bs3:row>
-						<bs3:col span="12">
+				<bs:tab name="Tab 2">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet id="fs2">
 								<cpt:property id="bookForTab2"/>
 								<cpt:property id="bookNameForTab2"/>
@@ -66,13 +66,13 @@
 							<cpt:collection defaultView="table" id="booksForTab2" paged="12"/>
 							<cpt:collection defaultView="table" id="productsForTab2" paged="12"/>
 
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
 
-			</bs3:tabGroup>
+			</bs:tabGroup>
 
-		</bs3:col>
+		</bs:col>
 
-    </bs3:row>
-</bs3:grid>
+    </bs:row>
+</bs:grid>
diff --git a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryJaxbVm.layout.xml b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryJaxbVm.layout.xml
index f8e913229d..a64908e704 100644
--- a/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryJaxbVm.layout.xml
+++ b/regressiontests/stable/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryJaxbVm.layout.xml
@@ -19,30 +19,30 @@
   ~
   -->
 
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.o [...]
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/links https://causeway.apache.org/applib/layout/links/links.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org [...]
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="4">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="4">
             <cpt:fieldSet name="General" unreferencedProperties="true">
                 <cpt:property id="name"/>
                 <cpt:property id="favoriteBook" />
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="12" unreferencedCollections="true">
+        </bs:col>
+        <bs:col span="12" unreferencedCollections="true">
             <cpt:collection defaultView="table" id="books" paged="12"/>
-        </bs3:col>
+        </bs:col>
 
-        <bs3:col span="12">
+        <bs:col span="12">
 
-        	<bs3:tabGroup>
+        	<bs:tabGroup>
 
-				<bs3:tab name="Tab 1">
-					<bs3:row>
-						<bs3:col span="12">
+				<bs:tab name="Tab 1">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet id="fs1">
 								<cpt:property id="bookForTab1"/>
 								<cpt:property id="bookNameForTab1"/>
@@ -51,13 +51,13 @@
 							<cpt:collection defaultView="table" id="booksForTab1" paged="12"/>
 							<cpt:collection defaultView="table" id="productsForTab1" paged="12"/>
 
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
 
-				<bs3:tab name="Tab 2">
-					<bs3:row>
-						<bs3:col span="12">
+				<bs:tab name="Tab 2">
+					<bs:row>
+						<bs:col span="12">
 							<cpt:fieldSet id="fs2">
 								<cpt:property id="bookForTab2"/>
 								<cpt:property id="bookNameForTab2"/>
@@ -66,13 +66,13 @@
 							<cpt:collection defaultView="table" id="booksForTab2" paged="12"/>
 							<cpt:collection defaultView="table" id="productsForTab2" paged="12"/>
 
-						</bs3:col>
-					</bs3:row>
-				</bs3:tab>
+						</bs:col>
+					</bs:row>
+				</bs:tab>
 
-			</bs3:tabGroup>
+			</bs:tabGroup>
 
-		</bs3:col>
+		</bs:col>
 
-    </bs3:row>
-</bs3:grid>
+    </bs:row>
+</bs:grid>
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
index 2b81320c01..4cafa1772e 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
@@ -17,14 +17,14 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<bs3:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <bs3:row>
-        <bs3:col span="12" unreferencedActions="true">
+<bs:grid xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="https://causeway.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <bs:row>
+        <bs:col span="12" unreferencedActions="true">
             <cpt:domainObject/>
-        </bs3:col>
-    </bs3:row>
-    <bs3:row>
-        <bs3:col span="6">
+        </bs:col>
+    </bs:row>
+    <bs:row>
+        <bs:col span="6">
             <cpt:fieldSet name="Identity" id="general" unreferencedProperties="true">
                 <cpt:action id="clearHints" position="PANEL_DROPDOWN"/>
                 <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
@@ -34,16 +34,16 @@
                 <cpt:property id="key"/>
                 <cpt:property id="fixtureScriptClassName" hidden="OBJECT_FORMS"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="6">
+        </bs:col>
+        <bs:col span="6">
             <cpt:fieldSet name="Result" id="result">
                 <cpt:property id="object"/>
                 <cpt:property id="className"/>
             </cpt:fieldSet>
-        </bs3:col>
-        <bs3:col span="0" unreferencedCollections="true">
+        </bs:col>
+        <bs:col span="0" unreferencedCollections="true">
             <cpt:fieldSet name="hidden">
             </cpt:fieldSet>
-        </bs3:col>
-    </bs3:row>
-</bs3:grid>
+        </bs:col>
+    </bs:row>
+</bs:grid>
diff --git a/tooling/metaprog/src/main/resources/$Templates.layout.xml b/tooling/metaprog/src/main/resources/$Templates.layout.xml
index 671874816c..cc9ceea4f8 100644
--- a/tooling/metaprog/src/main/resources/$Templates.layout.xml
+++ b/tooling/metaprog/src/main/resources/$Templates.layout.xml
@@ -9,34 +9,34 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
-		</bs3:col>
-		<bs3:col span="2">
+		</bs:col>
+		<bs:col span="2">
 			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
 
-	<bs3:row>
-		<bs3:col span="6">
-			<bs3:row>
-				<bs3:col span="12">
+	<bs:row>
+		<bs:col span="6">
+			<bs:row>
+				<bs:col span="12">
 					<cpt:collection id="entities"/>
-				</bs3:col>
-				<bs3:col span="12">
+				</bs:col>
+				<bs:col span="12">
 					<cpt:action id="openViewModel"/>
-				</bs3:col>
-			</bs3:row>
+				</bs:col>
+			</bs:row>
 			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
+		</bs:col>
+		<bs:col span="6">
 			<cpt:fieldSet name="Description" id="description" >
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -51,10 +51,10 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
                 <cpt:property id="description"/>
 			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12" unreferencedCollections="true"/>
+	</bs:row>
 
-</bs3:grid>
+</bs:grid>
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
index e126ed4493..09562a2e47 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity.layout.xml
@@ -9,33 +9,33 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
 			<cpt:action id="actionReturning"/>
 			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
+		</bs:col>
+		<bs:col span="2">
 			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
 
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
 			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
 			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
 			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
 			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
 			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
+		</bs:col>
+		<bs:col span="6">
 			<cpt:fieldSet name="Description" id="description" >
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -50,10 +50,10 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
                 <cpt:property id="description"/>
 			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12" unreferencedCollections="true"/>
+	</bs:row>
 
-</bs3:grid>
+</bs:grid>
diff --git a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
index 1bd3525158..f4ccce1573 100644
--- a/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
+++ b/tooling/metaprog/src/main/resources/persistence/$TemplateEntity~primitive.layout.xml
@@ -9,32 +9,32 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
 			<cpt:action id="actionReturning"/>
 			<cpt:action id="actionReturningArray"/>
-		</bs3:col>
-		<bs3:col span="2">
+		</bs:col>
+		<bs:col span="2">
 			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
 
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
 			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
 			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
 			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
 			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
+		</bs:col>
+		<bs:col span="6">
 			<cpt:fieldSet name="Description" id="description" >
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -49,10 +49,10 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
                 <cpt:property id="description"/>
 			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12" unreferencedCollections="true"/>
+	</bs:row>
 
-</bs3:grid>
+</bs:grid>
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
index 1df6c2e346..036a560a21 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm.layout.xml
@@ -9,33 +9,33 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
 			<cpt:action id="actionReturning"/>
 			<cpt:action id="actionReturningCollection"/>
-		</bs3:col>
-		<bs3:col span="2">
+		</bs:col>
+		<bs:col span="2">
 			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
 
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
 			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
 			<cpt:fieldSet name="Optional Properties" id="optional-properties"/>
 			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
 			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
 			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
+		</bs:col>
+		<bs:col span="6">
             <cpt:fieldSet name="Description" id="description" >
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -50,10 +50,10 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
                 <cpt:property id="description"/>
             </cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12" unreferencedCollections="true"/>
+	</bs:row>
 
-</bs3:grid>
+</bs:grid>
diff --git a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml b/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
index 1bd3525158..f4ccce1573 100644
--- a/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
+++ b/tooling/metaprog/src/main/resources/vm/$TemplateVm~primitive.layout.xml
@@ -9,32 +9,32 @@
 	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
 	OF ANY KIND, either express or implied. See the License for the specific
 	language governing permissions and limitations under the License. -->
-<bs3:grid
+<bs:grid
         xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd   https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
-        xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"
+        xmlns:bs="https://causeway.apache.org/applib/layout/grid/bootstrap3"
         xmlns:cpt="https://causeway.apache.org/applib/layout/component"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<bs3:row>
-		<bs3:col span="10" unreferencedActions="true">
+	<bs:row>
+		<bs:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
 			<cpt:action id="actionReturning"/>
 			<cpt:action id="actionReturningArray"/>
-		</bs3:col>
-		<bs3:col span="2">
+		</bs:col>
+		<bs:col span="2">
 			<cpt:fieldSet name="" id="sources" />
-		</bs3:col>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
 
-	<bs3:row>
-		<bs3:col span="6">
+	<bs:row>
+		<bs:col span="6">
 			<cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
 			<cpt:fieldSet name="Editable Properties" id="editable-properties"/>
 			<cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
 			<cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
 			<cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
-		</bs3:col>
-		<bs3:col span="6">
+		</bs:col>
+		<bs:col span="6">
 			<cpt:fieldSet name="Description" id="description" >
                 <cpt:action id="clearHints" position="PANEL" />
                 <cpt:action id="rebuildMetamodel" position="PANEL"/>
@@ -49,10 +49,10 @@
                 <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
                 <cpt:property id="description"/>
 			</cpt:fieldSet>
-		</bs3:col>
-	</bs3:row>
-	<bs3:row>
-		<bs3:col span="12" unreferencedCollections="true"/>
-	</bs3:row>
+		</bs:col>
+	</bs:row>
+	<bs:row>
+		<bs:col span="12" unreferencedCollections="true"/>
+	</bs:row>
 
-</bs3:grid>
+</bs:grid>