diff --git a/src/BlazorUI/Data/AASService.cs b/src/BlazorUI/Data/AASService.cs
index e40bac13..39550f2c 100644
--- a/src/BlazorUI/Data/AASService.cs
+++ b/src/BlazorUI/Data/AASService.cs
@@ -16,7 +16,7 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Aas = AasCore.Aas3_0_RC02;
+using Aas = AasCore.Aas3_0;
 using AdminShellNS;
 using Extensions;
 using AasxIntegrationBase;
@@ -249,7 +249,7 @@ public void buildTree(blazorSessionService bi)
                                                 Text = "PLUGIN",
                                                 Tag = new Tuple<AdminShellPackageEnv, Aas.Submodel,
                                                     Plugins.PluginInstance, AasxPluginResultVisualExtension>
-                                                        (bi.env, sm, lpi, ext),
+                                                        (bi.env, (Aas.Submodel)sm, lpi, ext),
                                                 Type = "Plugin"
                                             };
                                             smChilds.Add(piItem);
@@ -394,7 +394,7 @@ void createEntityItems(Item smeRootItem, Aas.Entity e, int i)
                 c.parent = smeRootItem;
         }
 
-        public List<Aas.Submodel> GetSubmodels(blazorSessionService bi)
+        public List<Aas.ISubmodel> GetSubmodels(blazorSessionService bi)
         {
             return bi.env.AasEnv.Submodels;
         }
diff --git a/src/BlazorUI/Pages/AnyUiRenderElem.razor b/src/BlazorUI/Pages/AnyUiRenderElem.razor
index 328c6033..c36c12f8 100644
--- a/src/BlazorUI/Pages/AnyUiRenderElem.razor
+++ b/src/BlazorUI/Pages/AnyUiRenderElem.razor
@@ -1,7 +1,6 @@
 @page "/test"
 @using AdminShellNS
-@using Aas = AasCore.Aas3_0_RC02
-@using AdminShellNS;
+@using Aas = AasCore.Aas3_0;
 @using Extensions
 @using AnyUi
 @using BlazorUI.Shared
diff --git a/src/BlazorUI/Pages/AnyUiRenderGrid.razor b/src/BlazorUI/Pages/AnyUiRenderGrid.razor
index dc5a4944..3b96626c 100644
--- a/src/BlazorUI/Pages/AnyUiRenderGrid.razor
+++ b/src/BlazorUI/Pages/AnyUiRenderGrid.razor
@@ -1,7 +1,6 @@
 @page "/test2"
 @using AdminShellNS
-@using Aas = AasCore.Aas3_0_RC02
-@using AdminShellNS;
+@using Aas = AasCore.Aas3_0
 @using Extensions
 @using AnyUi
 @using BlazorUI.Shared
diff --git a/src/BlazorUI/Pages/AnyUiRenderMultiText.razor b/src/BlazorUI/Pages/AnyUiRenderMultiText.razor
index 3d3f505d..612f72c0 100644
--- a/src/BlazorUI/Pages/AnyUiRenderMultiText.razor
+++ b/src/BlazorUI/Pages/AnyUiRenderMultiText.razor
@@ -1,7 +1,6 @@
 @page "/testMultiRenderText"
 @using AdminShellNS
-@using Aas = AasCore.Aas3_0_RC02
-@using AdminShellNS;
+@using Aas = AasCore.Aas3_0
 @using Extensions
 @using AnyUi
 @using BlazorUI.Shared
diff --git a/src/BlazorUI/Pages/AnyUiRenderStackPanel.razor b/src/BlazorUI/Pages/AnyUiRenderStackPanel.razor
index 64c27f71..c9c3cf66 100644
--- a/src/BlazorUI/Pages/AnyUiRenderStackPanel.razor
+++ b/src/BlazorUI/Pages/AnyUiRenderStackPanel.razor
@@ -1,7 +1,6 @@
 @page "/test3"
 @using AdminShellNS
-@using Aas = AasCore.Aas3_0_RC02
-@using AdminShellNS;
+@using Aas = AasCore.Aas3_0
 @using Extensions
 @using AnyUi
 @using BlazorUI.Shared
diff --git a/src/BlazorUI/Pages/AnyUiRenderWrapPanel.razor b/src/BlazorUI/Pages/AnyUiRenderWrapPanel.razor
index c5be8032..b846f7e0 100644
--- a/src/BlazorUI/Pages/AnyUiRenderWrapPanel.razor
+++ b/src/BlazorUI/Pages/AnyUiRenderWrapPanel.razor
@@ -1,7 +1,6 @@
 @page "/test4"
 @using AdminShellNS
-@using Aas = AasCore.Aas3_0_RC02
-@using AdminShellNS;
+@using Aas = AasCore.Aas3_0
 @using Extensions
 @using AnyUi
 @using BlazorUI.Shared
diff --git a/src/BlazorUI/Pages/Index.razor b/src/BlazorUI/Pages/Index.razor
index 076a75e3..0ade4dee 100644
--- a/src/BlazorUI/Pages/Index.razor
+++ b/src/BlazorUI/Pages/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
-@using Aas = AasCore.Aas3_0_RC02
+@using Aas = AasCore.Aas3_0
 @using AdminShellNS
 @using AasxIntegrationBase
 @*using BlazorUI*@
@@ -1091,48 +1091,48 @@
         {
             var sm = o as Aas.Submodel;
             ret = "";
-            if (sm.Kind != null && sm.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (sm.Kind != null && sm.Kind == Aas.ModelingKind.Template)
+            //    ret += "<T> ";
             ret += sm.IdShort;
         }
         if (o is Aas.ISubmodelElement)
         {
             var sme = o as Aas.ISubmodelElement;
             ret = "";
-            if (sme.Kind != null && sme.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (sme.Kind != null && sme.Kind == Aas.ModelingKind.Template)
+            //     ret += "<T> ";
             ret += sme.IdShort;
         }
         if (o is Aas.File)
         {
             var f = o as Aas.File;
             ret = "";
-            if (f.Kind != null && f.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (f.Kind != null && f.Kind == Aas.ModelingKind.Template)
+            //    ret += "<T> ";
             ret += f.IdShort;
         }
         if (o is Aas.Blob)
         {
             var b = o as Aas.Blob;
             ret = "";
-            if (b.Kind != null && b.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (b.Kind != null && b.Kind == Aas.ModelingKind.Template)
+            //    ret += "<T> ";
             ret += b.IdShort;
         }
-        if (o is AasCore.Aas3_0_RC02.Range)
+        if (o is Aas.Range)
         {
-            var r = o as AasCore.Aas3_0_RC02.Range;
+            var r = o as Aas.Range;
             ret = "";
-            if (r.Kind != null && r.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (r.Kind != null && r.Kind == Aas.ModelingKind.Template)
+            //    ret += "<T> ";
             ret += r.IdShort;
         }
         if (o is Aas.MultiLanguageProperty)
         {
             var mlp = o as Aas.MultiLanguageProperty;
             ret = "";
-            if (mlp.Kind != null && mlp.Kind == Aas.ModelingKind.Template)
-                ret += "<T> ";
+            // if (mlp.Kind != null && mlp.Kind == Aas.ModelingKind.Template)
+            //    ret += "<T> ";
             ret += mlp.IdShort;
         }
         return (ret);
@@ -1196,9 +1196,9 @@
                 }
             }
         }
-        if (o is AasCore.Aas3_0_RC02.Range)
+        if (o is Aas.Range)
         {
-            var r = o as AasCore.Aas3_0_RC02.Range;
+            var r = o as Aas.Range;
             ret = " = " + r.Min + " .. " + r.Max;
             if (r.Qualifiers != null && r.Qualifiers.Count > 0)
             {
@@ -1359,7 +1359,7 @@
                     if (found.htmlEventOutputs.Count == 1
                         && found.htmlEventOutputs[0] is Aas.IReferable rf)
                     {
-                        var kl = new List<Aas.Key>();
+                        var kl = new List<Aas.IKey>();
                         rf?.CollectReferencesByParent(kl);
                         pluginInstance?.InvokeAction("event-return",
                            new AasxIntegrationBase.AasxPluginEventReturnSelectAasEntity()
diff --git a/src/BlazorUI/StylePile.cs b/src/BlazorUI/StylePile.cs
index 22ee25d9..56bd1044 100644
--- a/src/BlazorUI/StylePile.cs
+++ b/src/BlazorUI/StylePile.cs
@@ -15,7 +15,6 @@ This source code may use other Open Source software components (see LICENSE.txt)
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text.RegularExpressions;