diff --git a/NextPvr.sln b/Jellyfin.Plugin.NextPVR.sln
similarity index 84%
rename from NextPvr.sln
rename to Jellyfin.Plugin.NextPVR.sln
index 2173796..85e982e 100644
--- a/NextPvr.sln
+++ b/Jellyfin.Plugin.NextPVR.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NextPvr", "NextPvr\NextPvr.csproj", "{83789E82-1F7F-4AAF-A427-D1BC8F01FE72}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.Plugin.NextPVR", "Jellyfin.Plugin.NextPVR\Jellyfin.Plugin.NextPVR.csproj", "{83789E82-1F7F-4AAF-A427-D1BC8F01FE72}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NextPvr/Configuration/PluginConfiguration.cs b/Jellyfin.Plugin.NextPVR/Configuration/PluginConfiguration.cs
similarity index 100%
rename from NextPvr/Configuration/PluginConfiguration.cs
rename to Jellyfin.Plugin.NextPVR/Configuration/PluginConfiguration.cs
diff --git a/NextPvr/Configuration/configPage.html b/Jellyfin.Plugin.NextPVR/Configuration/configPage.html
similarity index 100%
rename from NextPvr/Configuration/configPage.html
rename to Jellyfin.Plugin.NextPVR/Configuration/configPage.html
diff --git a/NextPvr/Helpers/DateTimeHelper.cs b/Jellyfin.Plugin.NextPVR/Helpers/DateTimeHelper.cs
similarity index 100%
rename from NextPvr/Helpers/DateTimeHelper.cs
rename to Jellyfin.Plugin.NextPVR/Helpers/DateTimeHelper.cs
diff --git a/NextPvr/Helpers/GeneralHelpers.cs b/Jellyfin.Plugin.NextPVR/Helpers/GeneralHelpers.cs
similarity index 100%
rename from NextPvr/Helpers/GeneralHelpers.cs
rename to Jellyfin.Plugin.NextPVR/Helpers/GeneralHelpers.cs
diff --git a/NextPvr/NextPvr.csproj b/Jellyfin.Plugin.NextPVR/Jellyfin.Plugin.NextPVR.csproj
similarity index 100%
rename from NextPvr/NextPvr.csproj
rename to Jellyfin.Plugin.NextPVR/Jellyfin.Plugin.NextPVR.csproj
diff --git a/NextPvr/LiveTvService.cs b/Jellyfin.Plugin.NextPVR/LiveTvService.cs
similarity index 100%
rename from NextPvr/LiveTvService.cs
rename to Jellyfin.Plugin.NextPVR/LiveTvService.cs
diff --git a/NextPvr/Plugin.cs b/Jellyfin.Plugin.NextPVR/Plugin.cs
similarity index 95%
rename from NextPvr/Plugin.cs
rename to Jellyfin.Plugin.NextPVR/Plugin.cs
index 7430e09..8a64b40 100644
--- a/NextPvr/Plugin.cs
+++ b/Jellyfin.Plugin.NextPVR/Plugin.cs
@@ -33,7 +33,7 @@ namespace NextPvr
             };
         }
 
-        private Guid _id = new Guid("9574ac10-bf23-49bc-949f-924f23cfa48f");
+        private Guid _id = new Guid("62c5a9c3-a283-4379-8756-7ea6ed3e7085");
         public override Guid Id
         {
             get { return _id; }
diff --git a/NextPvr/RecordingsChannel.cs b/Jellyfin.Plugin.NextPVR/RecordingsChannel.cs
similarity index 100%
rename from NextPvr/RecordingsChannel.cs
rename to Jellyfin.Plugin.NextPVR/RecordingsChannel.cs
diff --git a/NextPvr/Responses/CancelRecordingResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/CancelRecordingResponse.cs
similarity index 100%
rename from NextPvr/Responses/CancelRecordingResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/CancelRecordingResponse.cs
diff --git a/NextPvr/Responses/ChannelResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/ChannelResponse.cs
similarity index 100%
rename from NextPvr/Responses/ChannelResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/ChannelResponse.cs
diff --git a/NextPvr/Responses/DetailsServiceResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/DetailsServiceResponse.cs
similarity index 100%
rename from NextPvr/Responses/DetailsServiceResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/DetailsServiceResponse.cs
diff --git a/NextPvr/Responses/InitializeResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/InitializeResponse.cs
similarity index 100%
rename from NextPvr/Responses/InitializeResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/InitializeResponse.cs
diff --git a/NextPvr/Responses/InstantiateResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/InstantiateResponse.cs
similarity index 100%
rename from NextPvr/Responses/InstantiateResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/InstantiateResponse.cs
diff --git a/NextPvr/Responses/ListingsResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/ListingsResponse.cs
similarity index 100%
rename from NextPvr/Responses/ListingsResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/ListingsResponse.cs
diff --git a/NextPvr/Responses/RecordingResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/RecordingResponse.cs
similarity index 100%
rename from NextPvr/Responses/RecordingResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/RecordingResponse.cs
diff --git a/NextPvr/Responses/TimerDefaultsResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/TimerDefaultsResponse.cs
similarity index 100%
rename from NextPvr/Responses/TimerDefaultsResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/TimerDefaultsResponse.cs
diff --git a/NextPvr/Responses/TunerResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/TunerResponse.cs
similarity index 100%
rename from NextPvr/Responses/TunerResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/TunerResponse.cs
diff --git a/NextPvr/Responses/VLCResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/VLCResponse.cs
similarity index 100%
rename from NextPvr/Responses/VLCResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/VLCResponse.cs
diff --git a/NextPvr/Responses/VersionCheckResponse.cs b/Jellyfin.Plugin.NextPVR/Responses/VersionCheckResponse.cs
similarity index 100%
rename from NextPvr/Responses/VersionCheckResponse.cs
rename to Jellyfin.Plugin.NextPVR/Responses/VersionCheckResponse.cs
diff --git a/build.yaml b/build.yaml
index 66b2793..8ec19c6 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,6 +1,6 @@
 ---
 name: "NextPVR"
-guid: "9574ac10-bf23-49bc-949f-924f23cfa48f"
+guid: "62c5a9c3-a283-4379-8756-7ea6ed3e7085"
 version: "4.0.0.0"
 targetAbi: "10.6.0.0"
 overview: "Live TV plugin for NextPVR"
@@ -9,6 +9,6 @@ description: >
 category: "LiveTV"
 owner: "jellyfin"
 artifacts:
-- "NextPvr.dll"
+- "Jellfin.Plugin.NextPVR.dll"
 changelog: >
   changelog