diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp
index b2893d2b3..465f95a8b 100644
--- a/plugins/feature/afc/afc.cpp
+++ b/plugins/feature/afc/afc.cpp
@@ -394,8 +394,8 @@ void AFC::webapiFormatFeatureSettings(
     }
 
     response.getAfcSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getAfcSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getAfcSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getAfcSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getAfcSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void AFC::webapiUpdateFeatureSettings(
@@ -439,11 +439,11 @@ void AFC::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getAfcSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getAfcSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getAfcSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getAfcSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getAfcSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/antennatools/antennatools.cpp b/plugins/feature/antennatools/antennatools.cpp
index 60e16ec12..dce0fdc18 100644
--- a/plugins/feature/antennatools/antennatools.cpp
+++ b/plugins/feature/antennatools/antennatools.cpp
@@ -205,8 +205,8 @@ void AntennaTools::webapiFormatFeatureSettings(
     }
 
     response.getAntennaToolsSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getAntennaToolsSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getAntennaToolsSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getAntennaToolsSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getAntennaToolsSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void AntennaTools::webapiUpdateFeatureSettings(
@@ -247,11 +247,11 @@ void AntennaTools::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getAntennaToolsSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getAntennaToolsSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getAntennaToolsSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getAntennaToolsSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getAntennaToolsSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/aprs/aprs.cpp b/plugins/feature/aprs/aprs.cpp
index a03a32b83..29c315fa2 100644
--- a/plugins/feature/aprs/aprs.cpp
+++ b/plugins/feature/aprs/aprs.cpp
@@ -297,8 +297,8 @@ void APRS::webapiFormatFeatureSettings(
     }
 
     response.getAprsSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getAprsSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getAprsSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getAprsSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getAprsSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void APRS::webapiUpdateFeatureSettings(
@@ -336,11 +336,11 @@ void APRS::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getAprsSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getAprsSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getAprsSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getAprsSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getAprsSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp
index c8b1f14bf..39ba5a8aa 100644
--- a/plugins/feature/demodanalyzer/demodanalyzer.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp
@@ -420,8 +420,8 @@ void DemodAnalyzer::webapiFormatFeatureSettings(
     }
 
     response.getDemodAnalyzerSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getDemodAnalyzerSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getDemodAnalyzerSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getDemodAnalyzerSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getDemodAnalyzerSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void DemodAnalyzer::webapiUpdateFeatureSettings(
@@ -447,11 +447,11 @@ void DemodAnalyzer::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getDemodAnalyzerSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getDemodAnalyzerSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getDemodAnalyzerSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getDemodAnalyzerSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getDemodAnalyzerSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/map/map.cpp b/plugins/feature/map/map.cpp
index 0562e00d4..2cf0b1a07 100644
--- a/plugins/feature/map/map.cpp
+++ b/plugins/feature/map/map.cpp
@@ -252,8 +252,8 @@ void Map::webapiFormatFeatureSettings(
     }
 
     response.getMapSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getMapSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getMapSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getMapSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getMapSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void Map::webapiUpdateFeatureSettings(
@@ -279,11 +279,11 @@ void Map::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getMapSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getMapSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getMapSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getMapSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getMapSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp
index 7e7a51744..3214ebb24 100644
--- a/plugins/feature/rigctlserver/rigctlserver.cpp
+++ b/plugins/feature/rigctlserver/rigctlserver.cpp
@@ -283,8 +283,8 @@ void RigCtlServer::webapiFormatFeatureSettings(
     }
 
     response.getRigCtlServerSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getRigCtlServerSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getRigCtlServerSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getRigCtlServerSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getRigCtlServerSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void RigCtlServer::webapiUpdateFeatureSettings(
@@ -322,11 +322,11 @@ void RigCtlServer::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getRigCtlServerSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getRigCtlServerSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getRigCtlServerSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getRigCtlServerSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getRigCtlServerSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/satellitetracker/satellitetracker.cpp b/plugins/feature/satellitetracker/satellitetracker.cpp
index 5ee6b268b..22c930b9f 100644
--- a/plugins/feature/satellitetracker/satellitetracker.cpp
+++ b/plugins/feature/satellitetracker/satellitetracker.cpp
@@ -537,8 +537,8 @@ void SatelliteTracker::webapiFormatFeatureSettings(
     }
 
     response.getSatelliteTrackerSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getSatelliteTrackerSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getSatelliteTrackerSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getSatelliteTrackerSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getSatelliteTrackerSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void SatelliteTracker::webapiUpdateFeatureSettings(
@@ -639,11 +639,11 @@ void SatelliteTracker::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getSatelliteTrackerSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getSatelliteTrackerSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getSatelliteTrackerSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getSatelliteTrackerSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getSatelliteTrackerSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp
index d7db24a2e..550648ff1 100644
--- a/plugins/feature/simpleptt/simpleptt.cpp
+++ b/plugins/feature/simpleptt/simpleptt.cpp
@@ -311,8 +311,8 @@ void SimplePTT::webapiFormatFeatureSettings(
     }
 
     response.getSimplePttSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getSimplePttSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getSimplePttSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getSimplePttSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getSimplePttSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void SimplePTT::webapiUpdateFeatureSettings(
@@ -347,11 +347,11 @@ void SimplePTT::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getSimplePttSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getSimplePttSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getSimplePttSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getSimplePttSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getSimplePttSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp
index 78b3f9bea..43eb29304 100644
--- a/plugins/feature/startracker/startracker.cpp
+++ b/plugins/feature/startracker/startracker.cpp
@@ -318,8 +318,8 @@ void StarTracker::webapiFormatFeatureSettings(
     }
 
     response.getStarTrackerSettings()->setReverseApiPort(settings.m_reverseAPIPort);
-    response.getStarTrackerSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIFeatureSetIndex);
-    response.getStarTrackerSettings()->setReverseApiChannelIndex(settings.m_reverseAPIFeatureIndex);
+    response.getStarTrackerSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
+    response.getStarTrackerSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
 }
 
 void StarTracker::webapiUpdateFeatureSettings(
@@ -390,11 +390,11 @@ void StarTracker::webapiUpdateFeatureSettings(
     if (featureSettingsKeys.contains("reverseAPIPort")) {
         settings.m_reverseAPIPort = response.getStarTrackerSettings()->getReverseApiPort();
     }
-    if (featureSettingsKeys.contains("reverseAPIDeviceIndex")) {
-        settings.m_reverseAPIFeatureSetIndex = response.getStarTrackerSettings()->getReverseApiDeviceIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureSetIndex")) {
+        settings.m_reverseAPIFeatureSetIndex = response.getStarTrackerSettings()->getReverseApiFeatureSetIndex();
     }
-    if (featureSettingsKeys.contains("reverseAPIChannelIndex")) {
-        settings.m_reverseAPIFeatureIndex = response.getStarTrackerSettings()->getReverseApiChannelIndex();
+    if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
+        settings.m_reverseAPIFeatureIndex = response.getStarTrackerSettings()->getReverseApiFeatureIndex();
     }
 }
 
diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html
index ffdaa0625..ac7c67a66 100644
--- a/sdrbase/resources/webapi/doc/html2/index.html
+++ b/sdrbase/resources/webapi/doc/html2/index.html
@@ -853,10 +853,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1123,10 +1123,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1369,10 +1369,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1942,10 +1942,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -4174,10 +4174,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     },
     "spectrumConfig" : {
@@ -5845,10 +5845,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -7328,10 +7328,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -7898,10 +7898,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -9411,10 +9411,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10188,10 +10188,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10489,10 +10489,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10932,10 +10932,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -50580,7 +50580,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2021-09-12T20:10:39.058+02:00
+              Generated 2021-09-17T00:27:04.059+02:00
             </div>
           </div>
       </div>
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml
index ebd836e63..32c9fc356 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml
@@ -40,9 +40,9 @@ AFCSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 AFCReport:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AIS.yaml b/sdrbase/resources/webapi/doc/swagger/include/AIS.yaml
index ce29b7807..5a27a8ff3 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AIS.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AIS.yaml
@@ -12,7 +12,7 @@ AISSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/APRS.yaml b/sdrbase/resources/webapi/doc/swagger/include/APRS.yaml
index f61120a68..8f4530f32 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/APRS.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/APRS.yaml
@@ -24,7 +24,7 @@ APRSSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AntennaTools.yaml b/sdrbase/resources/webapi/doc/swagger/include/AntennaTools.yaml
index ba5e62d3d..dc88fa1ca 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/AntennaTools.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/AntennaTools.yaml
@@ -29,7 +29,7 @@ AntennaToolsSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml b/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml
index 2cea87636..a3f1deee3 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml
@@ -17,9 +17,9 @@ DemodAnalyzerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
     spectrumConfig:
       $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum"
diff --git a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml
index e193bd01e..602671e3f 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml
@@ -56,7 +56,7 @@ GS232ControllerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml
index 5981fa380..30f7f4982 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml
@@ -15,9 +15,9 @@ MapSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 MapActions:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml
index 20e5d3fbb..17daecba7 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml
@@ -44,9 +44,9 @@ PERTesterSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 PERTesterActions:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml
index dd425d754..4bee4eab0 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml
@@ -29,7 +29,7 @@ RigCtlServerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml
index 801812462..5da7b2bc2 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml
@@ -108,9 +108,9 @@ SatelliteTrackerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 SatelliteDeviceSettingsList:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml
index f8b520ffb..8396ca861 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml
@@ -24,9 +24,9 @@ SimplePTTSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 SimplePTTReport:
diff --git a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml
index 3a1128447..7c11f60f6 100644
--- a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml
+++ b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml
@@ -81,7 +81,7 @@ StarTrackerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/AFC.yaml b/swagger/sdrangel/api/swagger/include/AFC.yaml
index ebd836e63..32c9fc356 100644
--- a/swagger/sdrangel/api/swagger/include/AFC.yaml
+++ b/swagger/sdrangel/api/swagger/include/AFC.yaml
@@ -40,9 +40,9 @@ AFCSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 AFCReport:
diff --git a/swagger/sdrangel/api/swagger/include/AIS.yaml b/swagger/sdrangel/api/swagger/include/AIS.yaml
index ce29b7807..5a27a8ff3 100644
--- a/swagger/sdrangel/api/swagger/include/AIS.yaml
+++ b/swagger/sdrangel/api/swagger/include/AIS.yaml
@@ -12,7 +12,7 @@ AISSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/APRS.yaml b/swagger/sdrangel/api/swagger/include/APRS.yaml
index f61120a68..8f4530f32 100644
--- a/swagger/sdrangel/api/swagger/include/APRS.yaml
+++ b/swagger/sdrangel/api/swagger/include/APRS.yaml
@@ -24,7 +24,7 @@ APRSSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/AntennaTools.yaml b/swagger/sdrangel/api/swagger/include/AntennaTools.yaml
index ba5e62d3d..dc88fa1ca 100644
--- a/swagger/sdrangel/api/swagger/include/AntennaTools.yaml
+++ b/swagger/sdrangel/api/swagger/include/AntennaTools.yaml
@@ -29,7 +29,7 @@ AntennaToolsSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml b/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml
index e742b027d..352dfc0f1 100644
--- a/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml
+++ b/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml
@@ -17,9 +17,9 @@ DemodAnalyzerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
     spectrumConfig:
       $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum"
diff --git a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml
index e193bd01e..602671e3f 100644
--- a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml
+++ b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml
@@ -56,7 +56,7 @@ GS232ControllerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/Map.yaml b/swagger/sdrangel/api/swagger/include/Map.yaml
index a30ce9c7b..4c60e03cc 100644
--- a/swagger/sdrangel/api/swagger/include/Map.yaml
+++ b/swagger/sdrangel/api/swagger/include/Map.yaml
@@ -15,9 +15,9 @@ MapSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 MapActions:
diff --git a/swagger/sdrangel/api/swagger/include/PERTester.yaml b/swagger/sdrangel/api/swagger/include/PERTester.yaml
index 20e5d3fbb..17daecba7 100644
--- a/swagger/sdrangel/api/swagger/include/PERTester.yaml
+++ b/swagger/sdrangel/api/swagger/include/PERTester.yaml
@@ -44,9 +44,9 @@ PERTesterSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 PERTesterActions:
diff --git a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml
index dd425d754..4bee4eab0 100644
--- a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml
+++ b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml
@@ -29,7 +29,7 @@ RigCtlServerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml
index 44642f0a9..68f6b95f5 100644
--- a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml
+++ b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml
@@ -108,9 +108,9 @@ SatelliteTrackerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 SatelliteDeviceSettingsList:
diff --git a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml
index f8b520ffb..8396ca861 100644
--- a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml
+++ b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml
@@ -24,9 +24,9 @@ SimplePTTSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
 
 SimplePTTReport:
diff --git a/swagger/sdrangel/api/swagger/include/StarTracker.yaml b/swagger/sdrangel/api/swagger/include/StarTracker.yaml
index 3a1128447..7c11f60f6 100644
--- a/swagger/sdrangel/api/swagger/include/StarTracker.yaml
+++ b/swagger/sdrangel/api/swagger/include/StarTracker.yaml
@@ -81,7 +81,7 @@ StarTrackerSettings:
       type: string
     reverseAPIPort:
       type: integer
-    reverseAPIDeviceIndex:
+    reverseAPIFeatureSetIndex:
       type: integer
-    reverseAPIChannelIndex:
+    reverseAPIFeatureIndex:
       type: integer
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html
index ffdaa0625..ac7c67a66 100644
--- a/swagger/sdrangel/code/html2/index.html
+++ b/swagger/sdrangel/code/html2/index.html
@@ -853,10 +853,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1123,10 +1123,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1369,10 +1369,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -1942,10 +1942,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -4174,10 +4174,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     },
     "spectrumConfig" : {
@@ -5845,10 +5845,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -7328,10 +7328,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -7898,10 +7898,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -9411,10 +9411,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10188,10 +10188,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10489,10 +10489,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -10932,10 +10932,10 @@ margin-bottom: 20px;
     "reverseAPIPort" : {
       "type" : "integer"
     },
-    "reverseAPIDeviceIndex" : {
+    "reverseAPIFeatureSetIndex" : {
       "type" : "integer"
     },
-    "reverseAPIChannelIndex" : {
+    "reverseAPIFeatureIndex" : {
       "type" : "integer"
     }
   },
@@ -50580,7 +50580,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2021-09-12T20:10:39.058+02:00
+              Generated 2021-09-17T00:27:04.059+02:00
             </div>
           </div>
       </div>
diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp
index f3b50f2b6..8edbd6782 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.cpp
@@ -52,10 +52,10 @@ SWGAFCSettings::SWGAFCSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGAFCSettings::~SWGAFCSettings() {
@@ -88,10 +88,10 @@ SWGAFCSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -151,9 +151,9 @@ SWGAFCSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -207,11 +207,11 @@ SWGAFCSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -338,23 +338,23 @@ SWGAFCSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGAFCSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGAFCSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGAFCSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGAFCSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGAFCSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGAFCSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGAFCSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGAFCSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -398,10 +398,10 @@ SWGAFCSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h
index 823786018..6df71860c 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAFCSettings.h
@@ -78,11 +78,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -124,11 +124,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGAISSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAISSettings.cpp
index 58bcbdfb2..1f4ddcfbc 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAISSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAISSettings.cpp
@@ -38,10 +38,10 @@ SWGAISSettings::SWGAISSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGAISSettings::~SWGAISSettings() {
@@ -60,10 +60,10 @@ SWGAISSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -102,9 +102,9 @@ SWGAISSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -137,11 +137,11 @@ SWGAISSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -198,23 +198,23 @@ SWGAISSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGAISSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGAISSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGAISSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGAISSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGAISSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGAISSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGAISSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGAISSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -237,10 +237,10 @@ SWGAISSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGAISSettings.h b/swagger/sdrangel/code/qt5/client/SWGAISSettings.h
index 48db7e976..d24a7b557 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAISSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAISSettings.h
@@ -57,11 +57,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -82,11 +82,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.cpp
index 30ca1b992..03f69db6a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.cpp
@@ -50,10 +50,10 @@ SWGAPRSSettings::SWGAPRSSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGAPRSSettings::~SWGAPRSSettings() {
@@ -84,10 +84,10 @@ SWGAPRSSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -152,9 +152,9 @@ SWGAPRSSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -205,11 +205,11 @@ SWGAPRSSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -326,23 +326,23 @@ SWGAPRSSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGAPRSSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGAPRSSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGAPRSSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGAPRSSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGAPRSSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGAPRSSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGAPRSSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGAPRSSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -383,10 +383,10 @@ SWGAPRSSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.h b/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.h
index d29971bbe..506de0136 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAPRSSettings.h
@@ -75,11 +75,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -118,11 +118,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.cpp
index a5e7df196..06c049d8f 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.cpp
@@ -50,10 +50,10 @@ SWGAntennaToolsSettings::SWGAntennaToolsSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGAntennaToolsSettings::~SWGAntennaToolsSettings() {
@@ -84,10 +84,10 @@ SWGAntennaToolsSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -144,9 +144,9 @@ SWGAntennaToolsSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -197,11 +197,11 @@ SWGAntennaToolsSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -318,23 +318,23 @@ SWGAntennaToolsSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGAntennaToolsSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGAntennaToolsSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGAntennaToolsSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGAntennaToolsSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGAntennaToolsSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGAntennaToolsSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGAntennaToolsSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGAntennaToolsSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -375,10 +375,10 @@ SWGAntennaToolsSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.h b/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.h
index 84dcab495..78adbb1bc 100644
--- a/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGAntennaToolsSettings.h
@@ -75,11 +75,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -118,11 +118,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp
index b7e85a466..007d7fbe4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp
@@ -40,10 +40,10 @@ SWGDemodAnalyzerSettings::SWGDemodAnalyzerSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
     spectrum_config = nullptr;
     m_spectrum_config_isSet = false;
     scope_config = nullptr;
@@ -68,10 +68,10 @@ SWGDemodAnalyzerSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
     spectrum_config = new SWGGLSpectrum();
     m_spectrum_config_isSet = false;
     scope_config = new SWGGLScope();
@@ -123,9 +123,9 @@ SWGDemodAnalyzerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
     ::SWGSDRangel::setValue(&spectrum_config, pJson["spectrumConfig"], "SWGGLSpectrum", "SWGGLSpectrum");
     
@@ -165,11 +165,11 @@ SWGDemodAnalyzerSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
     if((spectrum_config != nullptr) && (spectrum_config->isSet())){
         toJsonValue(QString("spectrumConfig"), spectrum_config, obj, QString("SWGGLSpectrum"));
@@ -242,23 +242,23 @@ SWGDemodAnalyzerSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGDemodAnalyzerSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGDemodAnalyzerSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGDemodAnalyzerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGDemodAnalyzerSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGDemodAnalyzerSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGDemodAnalyzerSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGDemodAnalyzerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGDemodAnalyzerSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 SWGGLSpectrum*
@@ -304,10 +304,10 @@ SWGDemodAnalyzerSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
         if(spectrum_config && spectrum_config->isSet()){
diff --git a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h
index a22d2fd86..fa25bbe85 100644
--- a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h
@@ -62,11 +62,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
     SWGGLSpectrum* getSpectrumConfig();
     void setSpectrumConfig(SWGGLSpectrum* spectrum_config);
@@ -96,11 +96,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
     SWGGLSpectrum* spectrum_config;
     bool m_spectrum_config_isSet;
diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.cpp
index d2b798065..4e97f6e81 100644
--- a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.cpp
@@ -66,10 +66,10 @@ SWGGS232ControllerSettings::SWGGS232ControllerSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGGS232ControllerSettings::~SWGGS232ControllerSettings() {
@@ -116,10 +116,10 @@ SWGGS232ControllerSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -204,9 +204,9 @@ SWGGS232ControllerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -281,11 +281,11 @@ SWGGS232ControllerSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -482,23 +482,23 @@ SWGGS232ControllerSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGGS232ControllerSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGGS232ControllerSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGGS232ControllerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGGS232ControllerSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGGS232ControllerSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGGS232ControllerSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGGS232ControllerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGGS232ControllerSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -563,10 +563,10 @@ SWGGS232ControllerSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.h b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.h
index 10d0adfdd..50efe1cb9 100644
--- a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerSettings.h
@@ -99,11 +99,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -166,11 +166,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp
index e4c686e73..ad2a8d56a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp
@@ -40,10 +40,10 @@ SWGMapSettings::SWGMapSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGMapSettings::~SWGMapSettings() {
@@ -64,10 +64,10 @@ SWGMapSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -109,9 +109,9 @@ SWGMapSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -147,11 +147,11 @@ SWGMapSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -218,23 +218,23 @@ SWGMapSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGMapSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGMapSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGMapSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGMapSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGMapSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGMapSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGMapSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGMapSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -260,10 +260,10 @@ SWGMapSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGMapSettings.h b/swagger/sdrangel/code/qt5/client/SWGMapSettings.h
index 4a0b77869..258730a91 100644
--- a/swagger/sdrangel/code/qt5/client/SWGMapSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGMapSettings.h
@@ -60,11 +60,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -88,11 +88,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.cpp
index dc88e7702..158213576 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.cpp
@@ -60,10 +60,10 @@ SWGPERTesterSettings::SWGPERTesterSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGPERTesterSettings::~SWGPERTesterSettings() {
@@ -104,10 +104,10 @@ SWGPERTesterSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -191,9 +191,9 @@ SWGPERTesterSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -259,11 +259,11 @@ SWGPERTesterSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -430,23 +430,23 @@ SWGPERTesterSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGPERTesterSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGPERTesterSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGPERTesterSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGPERTesterSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGPERTesterSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGPERTesterSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGPERTesterSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGPERTesterSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -502,10 +502,10 @@ SWGPERTesterSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.h b/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.h
index 3f5dfac95..f187febd2 100644
--- a/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterSettings.h
@@ -91,11 +91,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -149,11 +149,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.cpp
index f2e4562ba..b7760937a 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.cpp
@@ -48,10 +48,10 @@ SWGRigCtlServerSettings::SWGRigCtlServerSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGRigCtlServerSettings::~SWGRigCtlServerSettings() {
@@ -80,10 +80,10 @@ SWGRigCtlServerSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -137,9 +137,9 @@ SWGRigCtlServerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -187,11 +187,11 @@ SWGRigCtlServerSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -298,23 +298,23 @@ SWGRigCtlServerSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGRigCtlServerSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGRigCtlServerSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGRigCtlServerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGRigCtlServerSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGRigCtlServerSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGRigCtlServerSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGRigCtlServerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGRigCtlServerSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -352,10 +352,10 @@ SWGRigCtlServerSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.h b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.h
index 5d0546c37..1fd8c21b5 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerSettings.h
@@ -72,11 +72,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -112,11 +112,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.cpp
index d99e024c0..eca718ebd 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.cpp
@@ -94,10 +94,10 @@ SWGSatelliteTrackerSettings::SWGSatelliteTrackerSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGSatelliteTrackerSettings::~SWGSatelliteTrackerSettings() {
@@ -172,10 +172,10 @@ SWGSatelliteTrackerSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -334,9 +334,9 @@ SWGSatelliteTrackerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -453,11 +453,11 @@ SWGSatelliteTrackerSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -794,23 +794,23 @@ SWGSatelliteTrackerSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGSatelliteTrackerSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGSatelliteTrackerSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGSatelliteTrackerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGSatelliteTrackerSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGSatelliteTrackerSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGSatelliteTrackerSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGSatelliteTrackerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGSatelliteTrackerSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -917,10 +917,10 @@ SWGSatelliteTrackerSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.h b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.h
index 4b27c94cd..ac2f27123 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerSettings.h
@@ -143,11 +143,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -252,11 +252,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.cpp
index 68a042929..cd4c0bec0 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.cpp
@@ -46,10 +46,10 @@ SWGSimplePTTSettings::SWGSimplePTTSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGSimplePTTSettings::~SWGSimplePTTSettings() {
@@ -76,10 +76,10 @@ SWGSimplePTTSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -130,9 +130,9 @@ SWGSimplePTTSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -177,11 +177,11 @@ SWGSimplePTTSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -278,23 +278,23 @@ SWGSimplePTTSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGSimplePTTSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGSimplePTTSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGSimplePTTSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGSimplePTTSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGSimplePTTSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGSimplePTTSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGSimplePTTSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGSimplePTTSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -329,10 +329,10 @@ SWGSimplePTTSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.h b/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.h
index f561b4d5c..046d8c471 100644
--- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTSettings.h
@@ -69,11 +69,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -106,11 +106,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };
 
diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.cpp
index 43beb03a0..1727cd211 100644
--- a/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.cpp
@@ -78,10 +78,10 @@ SWGStarTrackerSettings::SWGStarTrackerSettings() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 SWGStarTrackerSettings::~SWGStarTrackerSettings() {
@@ -140,10 +140,10 @@ SWGStarTrackerSettings::init() {
     m_reverse_api_address_isSet = false;
     reverse_api_port = 0;
     m_reverse_api_port_isSet = false;
-    reverse_api_device_index = 0;
-    m_reverse_api_device_index_isSet = false;
-    reverse_api_channel_index = 0;
-    m_reverse_api_channel_index_isSet = false;
+    reverse_api_feature_set_index = 0;
+    m_reverse_api_feature_set_index_isSet = false;
+    reverse_api_feature_index = 0;
+    m_reverse_api_feature_index_isSet = false;
 }
 
 void
@@ -254,9 +254,9 @@ SWGStarTrackerSettings::fromJsonObject(QJsonObject &pJson) {
     
     ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", "");
     
-    ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
+    ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", "");
     
 }
 
@@ -349,11 +349,11 @@ SWGStarTrackerSettings::asJsonObject() {
     if(m_reverse_api_port_isSet){
         obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
     }
-    if(m_reverse_api_device_index_isSet){
-        obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
+    if(m_reverse_api_feature_set_index_isSet){
+        obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index));
     }
-    if(m_reverse_api_channel_index_isSet){
-        obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
+    if(m_reverse_api_feature_index_isSet){
+        obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index));
     }
 
     return obj;
@@ -610,23 +610,23 @@ SWGStarTrackerSettings::setReverseApiPort(qint32 reverse_api_port) {
 }
 
 qint32
-SWGStarTrackerSettings::getReverseApiDeviceIndex() {
-    return reverse_api_device_index;
+SWGStarTrackerSettings::getReverseApiFeatureSetIndex() {
+    return reverse_api_feature_set_index;
 }
 void
-SWGStarTrackerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
-    this->reverse_api_device_index = reverse_api_device_index;
-    this->m_reverse_api_device_index_isSet = true;
+SWGStarTrackerSettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) {
+    this->reverse_api_feature_set_index = reverse_api_feature_set_index;
+    this->m_reverse_api_feature_set_index_isSet = true;
 }
 
 qint32
-SWGStarTrackerSettings::getReverseApiChannelIndex() {
-    return reverse_api_channel_index;
+SWGStarTrackerSettings::getReverseApiFeatureIndex() {
+    return reverse_api_feature_index;
 }
 void
-SWGStarTrackerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
-    this->reverse_api_channel_index = reverse_api_channel_index;
-    this->m_reverse_api_channel_index_isSet = true;
+SWGStarTrackerSettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) {
+    this->reverse_api_feature_index = reverse_api_feature_index;
+    this->m_reverse_api_feature_index_isSet = true;
 }
 
 
@@ -709,10 +709,10 @@ SWGStarTrackerSettings::isSet(){
         if(m_reverse_api_port_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_device_index_isSet){
+        if(m_reverse_api_feature_set_index_isSet){
             isObjectUpdated = true; break;
         }
-        if(m_reverse_api_channel_index_isSet){
+        if(m_reverse_api_feature_index_isSet){
             isObjectUpdated = true; break;
         }
     }while(false);
diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.h b/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.h
index ef414b10f..bde976d96 100644
--- a/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.h
+++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerSettings.h
@@ -117,11 +117,11 @@ public:
     qint32 getReverseApiPort();
     void setReverseApiPort(qint32 reverse_api_port);
 
-    qint32 getReverseApiDeviceIndex();
-    void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
+    qint32 getReverseApiFeatureSetIndex();
+    void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index);
 
-    qint32 getReverseApiChannelIndex();
-    void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
+    qint32 getReverseApiFeatureIndex();
+    void setReverseApiFeatureIndex(qint32 reverse_api_feature_index);
 
 
     virtual bool isSet() override;
@@ -202,11 +202,11 @@ private:
     qint32 reverse_api_port;
     bool m_reverse_api_port_isSet;
 
-    qint32 reverse_api_device_index;
-    bool m_reverse_api_device_index_isSet;
+    qint32 reverse_api_feature_set_index;
+    bool m_reverse_api_feature_set_index_isSet;
 
-    qint32 reverse_api_channel_index;
-    bool m_reverse_api_channel_index_isSet;
+    qint32 reverse_api_feature_index;
+    bool m_reverse_api_feature_index_isSet;
 
 };