diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Edit.razor b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Edit.razor
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Edit.razor
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Index.razor b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Index.razor
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Index.razor
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Interop.cs b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Interop.cs
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Interop.cs
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Interop.cs
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/ModuleInfo.cs b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/ModuleInfo.cs
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/ModuleInfo.cs
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/ModuleInfo.cs
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Settings.razor b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Settings.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Module]/Settings.razor
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Modules/[Owner].Module.[Module]/Settings.razor
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Edit.resx b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Edit.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Edit.resx
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Edit.resx
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Index.resx b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Index.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Index.resx
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Index.resx
diff --git a/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Settings.resx b/Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Settings.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Module]/Settings.resx
rename to Oqtane.Application/Server/wwwroot/Modules/Templates/Internal/Client/Resources/[Owner].Module.[Module]/Settings.resx
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/Container.resx b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Container.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/Container.resx
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Container.resx
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/ContainerSettings.resx b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/ContainerSettings.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/ContainerSettings.resx
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/ContainerSettings.resx
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/Theme.resx b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Theme.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/Theme.resx
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/Theme.resx
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/ThemeSettings.resx b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/ThemeSettings.resx
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Theme]/ThemeSettings.resx
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Resources/[Owner].Theme.[Theme]/ThemeSettings.resx
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/Container1.razor b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Container1.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/Container1.razor
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Container1.razor
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ContainerSettings.razor b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ContainerSettings.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ContainerSettings.razor
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ContainerSettings.razor
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/Theme1.razor b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Theme1.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/Theme1.razor
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/Theme1.razor
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ThemeInfo.cs b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeInfo.cs
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ThemeInfo.cs
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeInfo.cs
diff --git a/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ThemeSettings.razor b/Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeSettings.razor
similarity index 100%
rename from Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Theme]/ThemeSettings.razor
rename to Oqtane.Application/Server/wwwroot/Themes/Templates/Internal/Client/Themes/[Owner].Theme.[Theme]/ThemeSettings.razor