diff --git a/.gitmodules b/.gitmodules
index 27c300858..b6d5b7b5d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,9 +37,9 @@
 [submodule "OmniBLE"]
 	path = OmniBLE
 	url = https://github.com/LoopKit/OmniBLE.git
-[submodule "NightscoutAPIClient"]
-	path = NightscoutAPIClient
-	url = https://github.com/LoopKit/NightscoutAPIClient.git
+[submodule "NightscoutRemoteCGM"]
+	path = NightscoutRemoteCGM
+	url = https://github.com/LoopKit/NightscoutRemoteCGM.git
 [submodule "LoopSupport"]
 	path = LoopSupport
 	url = https://github.com/LoopKit/LoopSupport
diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
index 661695ef7..b01f61dfb 100644
--- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata
+++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata
@@ -45,10 +45,10 @@
       location = "group:TidepoolService/TidepoolService.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:NightscoutService/NightscoutService.xcodeproj">
+      location = "group:NightscoutRemoteCGM/NightscoutRemoteCGM.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
+      location = "group:NightscoutService/NightscoutService.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:MKRingProgressView/MKRingProgressView.xcodeproj">
diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
index 5120a1a48..b4acf645a 100644
--- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
+++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme
@@ -337,9 +337,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A9BAC72626CDB7A5001C9493"
-               BuildableName = "NightscoutAPIClientPlugin.loopplugin"
-               BlueprintName = "NightscoutAPIClientPlugin"
-               ReferencedContainer = "container:NightscoutAPIClient/NightscoutAPIClient.xcodeproj">
+               BuildableName = "NightscoutRemoteCGMPlugin.loopplugin"
+               BlueprintName = "NightscoutRemoteCGMPlugin"
+               ReferencedContainer = "container:NightscoutRemoteCGM/NightscoutRemoteCGM.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
diff --git a/NightscoutAPIClient b/NightscoutAPIClient
deleted file mode 160000
index 5e816a7be..000000000
--- a/NightscoutAPIClient
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5e816a7be470b705ad52c3c4faca9acc03b5666f
diff --git a/NightscoutRemoteCGM b/NightscoutRemoteCGM
new file mode 160000
index 000000000..7f5cd6b0c
--- /dev/null
+++ b/NightscoutRemoteCGM
@@ -0,0 +1 @@
+Subproject commit 7f5cd6b0c792e4a1d55efb70ec638fa1232e5594