diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
index 6454aaab..35979d78 100644
--- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -80,7 +80,7 @@
     protected override async Task OnInitAsync()
     {
         title = ModuleState.Title;
-        containers = ThemeService.CalculateSelectableContainers(await ThemeService.GetThemesAsync());
+        containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync());
         containertype = ModuleState.ContainerType;
         viewpermissions = ModuleState.ViewPermissions;
         editpermissions = ModuleState.EditPermissions;
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 636b77ae..47e1eaa1 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -135,8 +135,8 @@
     protected override async Task OnInitAsync()
     {
         var Themes = await ThemeService.GetThemesAsync();
-        themes = ThemeService.CalculateSelectableThemes(Themes);
-        panelayouts = ThemeService.CalculateSelectablePaneLayouts(Themes);
+        themes = ThemeService.GetThemeTypes(Themes);
+        panelayouts = ThemeService.GetPaneLayoutTypes(Themes);
     }
 
     private async Task SavePage()
diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
index 156b6d96..02635aaf 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -136,8 +136,8 @@
     protected override async Task OnInitAsync()
     {
         List<Theme> Themes = await ThemeService.GetThemesAsync();
-        themes = ThemeService.CalculateSelectableThemes(Themes);
-        panelayouts = ThemeService.CalculateSelectablePaneLayouts(Themes);
+        themes = ThemeService.GetThemeTypes(Themes);
+        panelayouts = ThemeService.GetPaneLayoutTypes(Themes);
 
         PageId = Int32.Parse(PageState.QueryString["id"]);
         Page p = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault();
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index af201b9e..1d0f389b 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -136,8 +136,8 @@
     protected override async Task OnInitAsync()
     {
         List<Theme> Themes = await ThemeService.GetThemesAsync();
-        themes = ThemeService.CalculateSelectableThemes(Themes);
-        panelayouts = ThemeService.CalculateSelectablePaneLayouts(Themes);
+        themes = ThemeService.GetThemeTypes(Themes);
+        panelayouts = ThemeService.GetPaneLayoutTypes(Themes);
 
         PageId = Int32.Parse(PageState.QueryString["id"]);
         Page p = PageState.Pages.Where(item => item.PageId == PageId).FirstOrDefault();
diff --git a/Oqtane.Client/Services/IthemeService.cs b/Oqtane.Client/Services/IthemeService.cs
index 1a2ec875..dcc6f674 100644
--- a/Oqtane.Client/Services/IthemeService.cs
+++ b/Oqtane.Client/Services/IthemeService.cs
@@ -7,8 +7,8 @@ namespace Oqtane.Services
     public interface IThemeService
     {
         Task<List<Theme>> GetThemesAsync();
-        Dictionary<string, string> CalculateSelectableThemes(List<Theme> themes);
-        Dictionary<string, string> CalculateSelectablePaneLayouts(List<Theme> themes);
-        Dictionary<string, string> CalculateSelectableContainers(List<Theme> themes);
+        Dictionary<string, string> GetThemeTypes(List<Theme> themes);
+        Dictionary<string, string> GetPaneLayoutTypes(List<Theme> themes);
+        Dictionary<string, string> GetContainerTypes(List<Theme> themes);
     }
 }
diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs
index ca67509e..5ed20b45 100644
--- a/Oqtane.Client/Services/ThemeService.cs
+++ b/Oqtane.Client/Services/ThemeService.cs
@@ -58,7 +58,7 @@ namespace Oqtane.Services
             return themes.OrderBy(item => item.Name).ToList();
         }
 
-        public Dictionary<string, string> CalculateSelectableThemes(List<Theme> themes)
+        public Dictionary<string, string> GetThemeTypes(List<Theme> themes)
         {
             var selectableThemes = new Dictionary<string, string>();
             foreach (Theme theme in themes)
@@ -71,7 +71,7 @@ namespace Oqtane.Services
             return selectableThemes;
         }
 
-        public Dictionary<string, string> CalculateSelectablePaneLayouts(List<Theme> themes)
+        public Dictionary<string, string> GetPaneLayoutTypes(List<Theme> themes)
         {
             var selectablePaneLayouts = new Dictionary<string, string>();
             foreach (Theme theme in themes)
@@ -84,7 +84,7 @@ namespace Oqtane.Services
             return selectablePaneLayouts;
         }
 
-        public Dictionary<string, string> CalculateSelectableContainers(List<Theme> themes)
+        public Dictionary<string, string> GetContainerTypes(List<Theme> themes)
         {
             var selectableContainers = new Dictionary<string, string>();
             foreach (Theme theme in themes)
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index fde455a4..70ca422c 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -84,7 +84,7 @@
     {
         //TODO: Move this to shared component.  This is used in this control Add, Edit, and Delete controls as well
         moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync();
-        containers = ThemeService.CalculateSelectableContainers(await ThemeService.GetThemesAsync());
+        containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync());
         List<Module> modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId, Constants.PageManagementModule);
         pagemanagementmoduleid = modules.FirstOrDefault().ModuleId;
         if (UserService.IsAuthorized(PageState.User, PageState.Page.EditPermissions))