diff --git a/Oqtane.Client/Services/Interfaces/IThemeService.cs b/Oqtane.Client/Services/Interfaces/IThemeService.cs
index 6ad83fba..4dc636c2 100644
--- a/Oqtane.Client/Services/Interfaces/IThemeService.cs
+++ b/Oqtane.Client/Services/Interfaces/IThemeService.cs
@@ -25,11 +25,12 @@ namespace Oqtane.Services
         Task<Theme> GetThemeAsync(int themeId, int siteId);
 
         /// <summary>
-        /// Returns a theme <see cref="ThemeControl"/>s containing a theme control type
+        /// Returns a theme <see cref="ThemeControl"/>s containing a specific theme control type
         /// </summary>
         /// <param name="themes"></param>
+        /// <param name="themeControlType"></param>
         /// <returns></returns>
-        Theme GetTheme(List<Theme> themes, string themeType);
+        Theme GetTheme(List<Theme> themes, string themeControlType);
 
         /// <summary>
         /// Returns a list of <see cref="ThemeControl"/>s from the given themes
@@ -39,19 +40,20 @@ namespace Oqtane.Services
         List<ThemeControl> GetThemeControls(List<Theme> themes);
 
         /// <summary>
-        /// Returns a list of <see cref="ThemeControl"/>s from the given themes with a matching theme type
+        /// Returns a list of <see cref="ThemeControl"/>s for a theme containing a specific theme control type
         /// </summary>
         /// <param name="themes"></param>
+        /// <param name="themeControlType"></param>
         /// <returns></returns>
-        List<ThemeControl> GetThemeControls(List<Theme> themes, string themeType);
+        List<ThemeControl> GetThemeControls(List<Theme> themes, string themeControlType);
 
         /// <summary>
-        /// Returns a list of containers (<see cref="ThemeControl"/>) from the given themes with a matching theme type
+        /// Returns a list of containers (<see cref="ThemeControl"/>) for a theme containing a specific theme control type
         /// </summary>
         /// <param name="themes"></param>
-        /// <param name="themeName"></param>
+        /// <param name="themeControlType"></param>
         /// <returns></returns>
-        List<ThemeControl> GetContainerControls(List<Theme> themes, string themeType);
+        List<ThemeControl> GetContainerControls(List<Theme> themes, string themeControlType);
 
         /// <summary>
         /// Updates a existing theem
diff --git a/Oqtane.Client/Services/ThemeService.cs b/Oqtane.Client/Services/ThemeService.cs
index e4cf06d6..d1c03495 100644
--- a/Oqtane.Client/Services/ThemeService.cs
+++ b/Oqtane.Client/Services/ThemeService.cs
@@ -26,9 +26,9 @@ namespace Oqtane.Services
             return await GetJsonAsync<Theme>($"{ApiUrl}/{themeId}?siteid={siteId}");
         }
 
-        public Theme GetTheme(List<Theme> themes, string themeType)
+        public Theme GetTheme(List<Theme> themes, string themeControlType)
         {
-            return themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == themeType));
+            return themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == themeControlType));
         }
 
         public List<ThemeControl> GetThemeControls(List<Theme> themes)
@@ -36,15 +36,15 @@ namespace Oqtane.Services
             return themes.SelectMany(item => item.Themes).OrderBy(item => item.Name).ToList();
         }
 
-        public List<ThemeControl> GetThemeControls(List<Theme> themes, string themeType)
+        public List<ThemeControl> GetThemeControls(List<Theme> themes, string themeControlType)
         {
-            return GetTheme(themes, themeType)?.Themes.OrderBy(item => item.Name).ToList();
+            return GetTheme(themes, themeControlType)?.Themes.OrderBy(item => item.Name).ToList();
         }
 
 
-        public List<ThemeControl> GetContainerControls(List<Theme> themes, string themeType)
+        public List<ThemeControl> GetContainerControls(List<Theme> themes, string themeControlType)
         {
-            return GetTheme(themes, themeType)?.Containers.OrderBy(item => item.Name).ToList();
+            return GetTheme(themes, themeControlType)?.Containers.OrderBy(item => item.Name).ToList();
         }
 
         public async Task UpdateThemeAsync(Theme theme)