diff --git a/plugins/samplesink/audiooutput/audiooutputwebapiadapter.cpp b/plugins/samplesink/audiooutput/audiooutputwebapiadapter.cpp
index 5bafb0148..f629ac28c 100644
--- a/plugins/samplesink/audiooutput/audiooutputwebapiadapter.cpp
+++ b/plugins/samplesink/audiooutput/audiooutputwebapiadapter.cpp
@@ -30,8 +30,8 @@ int AudioOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setAudioOutputSettings(new SWGSDRangel::SWGAudioOutputSettings());
+    response.getAudioOutputSettings()->init();
     AudioOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp b/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp
index ab9473bfc..f69fe704e 100644
--- a/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1outputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int BladeRF1OutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setBladeRf1OutputSettings(new SWGSDRangel::SWGBladeRF1OutputSettings());
+    response.getBladeRf1OutputSettings()->init();
     Bladerf1Output::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp b/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp
index 5a39a183c..aa4c3034c 100644
--- a/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2outputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int BladeRF2OutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setBladeRf2OutputSettings(new SWGSDRangel::SWGBladeRF2OutputSettings());
+    response.getBladeRf2OutputSettings()->init();
     BladeRF2Output::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp
index 087284928..77fa7a0bc 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int HackRFOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setHackRfOutputSettings(new SWGSDRangel::SWGHackRFOutputSettings());
+    response.getHackRfOutputSettings()->init();
     HackRFOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp b/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp
index 0ac19e645..ebba1a811 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int LimeSDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
+    response.getLimeSdrOutputSettings()->init();
     LimeSDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp b/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp
index 9a912debe..13b798783 100644
--- a/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp
+++ b/plugins/samplesink/localoutput/localoutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int LocalOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setLocalOutputSettings(new SWGSDRangel::SWGLocalOutputSettings());
+    response.getLocalOutputSettings()->init();
     LocalOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp
index aaa7bb2d2..d083abcf2 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int PlutoSDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setPlutoSdrOutputSettings(new SWGSDRangel::SWGPlutoSdrOutputSettings());
+    response.getPlutoSdrOutputSettings()->init();
     PlutoSDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp b/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp
index d0da4a9c8..d1a7f35ad 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int RemoteOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setRemoteOutputSettings(new SWGSDRangel::SWGRemoteOutputSettings());
+    response.getRemoteOutputSettings()->init();
     RemoteOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp
index 9c26da7c0..ffdb0ebe3 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int SoapySDROutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setSoapySdrOutputSettings(new SWGSDRangel::SWGSoapySDROutputSettings());
+    response.getSoapySdrOutputSettings()->init();
     SoapySDROutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp b/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp
index f1460a382..b1fa8a9d7 100644
--- a/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp
+++ b/plugins/samplesink/usrpoutput/usrpoutputwebapiadapter.cpp
@@ -34,8 +34,8 @@ int USRPOutputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setUsrpOutputSettings(new SWGSDRangel::SWGUSRPOutputSettings());
+    response.getUsrpOutputSettings()->init();
     USRPOutput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp b/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp
index 699069191..56969a5c4 100644
--- a/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp
+++ b/plugins/samplesource/audioinput/audioinputwebapiadapter.cpp
@@ -31,8 +31,8 @@ int AudioInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setAudioInputSettings(new SWGSDRangel::SWGAudioInputSettings());
+    response.getAudioInputSettings()->init();
     AudioInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp b/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp
index 8789f39e8..062696b0e 100644
--- a/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp
+++ b/plugins/samplesource/bladerf1input/bladerf1inputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int BladeRF1InputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setBladeRf1InputSettings(new SWGSDRangel::SWGBladeRF1InputSettings());
+    response.getBladeRf1InputSettings()->init();
     Bladerf1Input::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp b/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp
index 496e1b12c..6146b983b 100644
--- a/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2inputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int BladeRF2InputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setBladeRf2InputSettings(new SWGSDRangel::SWGBladeRF2InputSettings());
+    response.getBladeRf2InputSettings()->init();
     BladeRF2Input::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp b/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp
index 95bcdcdbd..b925702d0 100644
--- a/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp
+++ b/plugins/samplesource/fcdpro/fcdprowebapiadapter.cpp
@@ -33,8 +33,8 @@ int FCDProWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setFcdProSettings(new SWGSDRangel::SWGFCDProSettings());
+    response.getFcdProSettings()->init();
     FCDProInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp b/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp
index 3b70222ce..99912e2cc 100644
--- a/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp
+++ b/plugins/samplesource/fcdproplus/fcdpropluswebapiadapter.cpp
@@ -33,8 +33,8 @@ int FCDProPlusWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setFcdProPlusSettings(new SWGSDRangel::SWGFCDProPlusSettings());
+    response.getFcdProPlusSettings()->init();
     FCDProPlusInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp b/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp
index 6423802aa..35958d0cf 100644
--- a/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp
+++ b/plugins/samplesource/fileinput/fileinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int FileInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setFileInputSettings(new SWGSDRangel::SWGFileInputSettings());
+    response.getFileInputSettings()->init();
     FileInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp b/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp
index 0a6d0b1c3..63ce85ac7 100644
--- a/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp
+++ b/plugins/samplesource/kiwisdr/kiwisdrwebapiadapter.cpp
@@ -33,8 +33,8 @@ int KiwiSDRWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setKiwiSdrSettings(new SWGSDRangel::SWGKiwiSDRSettings());
+    response.getKiwiSdrSettings()->init();
     KiwiSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp b/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp
index bf6b9ada0..09e6d8602 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int LimeSDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setLimeSdrInputSettings(new SWGSDRangel::SWGLimeSdrInputSettings());
+    response.getLimeSdrInputSettings()->init();
     LimeSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/localinput/localinputwebapiadapter.cpp b/plugins/samplesource/localinput/localinputwebapiadapter.cpp
index 87a687479..c8ce72205 100644
--- a/plugins/samplesource/localinput/localinputwebapiadapter.cpp
+++ b/plugins/samplesource/localinput/localinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int LocalInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setLocalInputSettings(new SWGSDRangel::SWGLocalInputSettings());
+    response.getLocalInputSettings()->init();
     LocalInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/perseus/perseuswebapiadapter.cpp b/plugins/samplesource/perseus/perseuswebapiadapter.cpp
index d152f011f..cea5a78e2 100644
--- a/plugins/samplesource/perseus/perseuswebapiadapter.cpp
+++ b/plugins/samplesource/perseus/perseuswebapiadapter.cpp
@@ -33,8 +33,8 @@ int PerseusWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setPerseusSettings(new SWGSDRangel::SWGPerseusSettings());
+    response.getPerseusSettings()->init();
     PerseusInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp
index 8b010f952..5e9363429 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int PlutoSDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setPlutoSdrInputSettings(new SWGSDRangel::SWGPlutoSdrInputSettings());
+    response.getPlutoSdrInputSettings()->init();
     PlutoSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp b/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp
index 2abbe5fd3..c379c8128 100644
--- a/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int RemoteInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setRemoteInputSettings(new SWGSDRangel::SWGRemoteInputSettings());
+    response.getRemoteInputSettings()->init();
     RemoteInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp b/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp
index 9d6f8eda5..1f37b81a1 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrwebapiadapter.cpp
@@ -33,8 +33,8 @@ int RTLSDRWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setRtlSdrSettings(new SWGSDRangel::SWGRtlSdrSettings());
+    response.getRtlSdrSettings()->init();
     RTLSDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp b/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp
index f6a74c707..aa2697eb0 100644
--- a/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaywebapiadapter.cpp
@@ -33,8 +33,8 @@ int SDRPlayWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setSdrPlaySettings(new SWGSDRangel::SWGSDRPlaySettings());
+    response.getSdrPlaySettings()->init();
     SDRPlayInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp
index 32992a944..48c159d20 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int SigMFFileInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setSigMfFileInputSettings(new SWGSDRangel::SWGSigMFFileInputSettings());
+    response.getSigMfFileInputSettings()->init();
     SigMFFileInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
index ef7d5aa91..79cd5e307 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinputwebapiadapter.cpp
@@ -33,8 +33,8 @@ int SoapySDRInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setSoapySdrInputSettings(new SWGSDRangel::SWGSoapySDRInputSettings());
+    response.getSoapySdrInputSettings()->init();
     SoapySDRInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/testsource/testsourcewebapiadapter.cpp b/plugins/samplesource/testsource/testsourcewebapiadapter.cpp
index 108fe3ff6..d4f28d7b3 100644
--- a/plugins/samplesource/testsource/testsourcewebapiadapter.cpp
+++ b/plugins/samplesource/testsource/testsourcewebapiadapter.cpp
@@ -33,8 +33,8 @@ int TestSourceWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setTestSourceSettings(new SWGSDRangel::SWGTestSourceSettings());
+    response.getTestSourceSettings()->init();
     TestSourceInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp b/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp
index c301b1f5d..4c6e469b5 100644
--- a/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp
+++ b/plugins/samplesource/usrpinput/usrpinputwebapiadapter.cpp
@@ -34,8 +34,8 @@ int USRPInputWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setAirspyHfSettings(new SWGSDRangel::SWGAirspyHFSettings());
-    response.getAirspyHfSettings()->init();
+    response.setUsrpInputSettings(new SWGSDRangel::SWGUSRPInputSettings());
+    response.getUsrpInputSettings()->init();
     USRPInput::webapiFormatDeviceSettings(response, m_settings);
     return 200;
 }