diff --git a/tv/tuner/aidl/default/Filter.cpp b/tv/tuner/aidl/default/Filter.cpp
index dd9bee3..6c4b28c 100644
--- a/tv/tuner/aidl/default/Filter.cpp
+++ b/tv/tuner/aidl/default/Filter.cpp
@@ -46,29 +46,29 @@
 
     switch (mType.mainType) {
         case DemuxFilterMainType::TS:
-            if (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+            if (mType.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::AUDIO ||
-                mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+                mType.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::VIDEO) {
                 mIsMediaFilter = true;
             }
-            if (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+            if (mType.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                 DemuxTsFilterType::PCR) {
                 mIsPcrFilter = true;
             }
-            if (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+            if (mType.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                 DemuxTsFilterType::RECORD) {
                 mIsRecordFilter = true;
             }
             break;
         case DemuxFilterMainType::MMTP:
-            if (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+            if (mType.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::AUDIO ||
-                mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+                mType.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::VIDEO) {
                 mIsMediaFilter = true;
             }
-            if (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+            if (mType.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                 DemuxMmtpFilterType::RECORD) {
                 mIsRecordFilter = true;
             }
@@ -538,7 +538,7 @@
     std::lock_guard<std::mutex> lock(mFilterOutputLock);
     switch (mType.mainType) {
         case DemuxFilterMainType::TS:
-            switch (mType.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>()) {
+            switch (mType.subType.get<DemuxFilterSubType::Tag::tsFilterType>()) {
                 case DemuxTsFilterType::UNDEFINED:
                     break;
                 case DemuxTsFilterType::SECTION:
diff --git a/tv/tuner/aidl/vts/functional/DescramblerTests.cpp b/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
index e0ee391..157fa04 100644
--- a/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
+++ b/tv/tuner/aidl/vts/functional/DescramblerTests.cpp
@@ -175,9 +175,9 @@
                                                                 DemuxPid& pid) {
     switch (type.mainType) {
         case DemuxFilterMainType::TS:
-            if (type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+            if (type.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::AUDIO ||
-                type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>() ==
+                type.subType.get<DemuxFilterSubType::Tag::tsFilterType>() ==
                         DemuxTsFilterType::VIDEO) {
                 pid.set<DemuxPid::Tag::tPid>(settings.get<DemuxFilterSettings::Tag::ts>().tpid);
             } else {
@@ -186,9 +186,9 @@
             }
             break;
         case DemuxFilterMainType::MMTP:
-            if (type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+            if (type.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::AUDIO ||
-                type.subType.get<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>() ==
+                type.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>() ==
                         DemuxMmtpFilterType::VIDEO) {
                 pid.set<DemuxPid::Tag::mmtpPid>(
                         settings.get<DemuxFilterSettings::Tag::mmtp>().mmtpPid);
diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
index e5cee76..13c5a80 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h
@@ -146,23 +146,23 @@
         type.mainType = static_cast<DemuxFilterMainType>(1 << bit);
         switch (type.mainType) {
             case DemuxFilterMainType::TS:
-                type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                         DemuxTsFilterType::UNDEFINED);
                 break;
             case DemuxFilterMainType::MMTP:
-                type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                         DemuxMmtpFilterType::UNDEFINED);
                 break;
             case DemuxFilterMainType::IP:
-                type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                         DemuxIpFilterType::UNDEFINED);
                 break;
             case DemuxFilterMainType::TLV:
-                type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tlvFilterType>(
+                type.subType.set<DemuxFilterSubType::Tag::tlvFilterType>(
                         DemuxTlvFilterType::UNDEFINED);
                 break;
             case DemuxFilterMainType::ALP:
-                type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::alpFilterType>(
+                type.subType.set<DemuxFilterSubType::Tag::alpFilterType>(
                         DemuxAlpFilterType::UNDEFINED);
                 break;
             default:
diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
index 1ddb641..b4fb54f 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
@@ -119,9 +119,8 @@
     string defaultVideoFilterId = "FILTER_VIDEO_DEFAULT";
 
     filterMap[defaultVideoFilterId].type.mainType = DemuxFilterMainType::TS;
-    filterMap[defaultVideoFilterId]
-            .type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
-                    DemuxTsFilterType::VIDEO);
+    filterMap[defaultVideoFilterId].type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
+            DemuxTsFilterType::VIDEO);
     filterMap[defaultVideoFilterId].bufferSize = FMQ_SIZE_16M;
     filterMap[defaultVideoFilterId].settings =
             DemuxFilterSettings::make<DemuxFilterSettings::Tag::ts>();
@@ -138,9 +137,8 @@
             VideoStreamType::MPEG1);
 
     filterMap[defaultAudioFilterId].type.mainType = DemuxFilterMainType::TS;
-    filterMap[defaultAudioFilterId]
-            .type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
-                    DemuxTsFilterType::AUDIO);
+    filterMap[defaultAudioFilterId].type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
+            DemuxTsFilterType::AUDIO);
     filterMap[defaultAudioFilterId].bufferSize = FMQ_SIZE_16M;
     filterMap[defaultAudioFilterId].settings =
             DemuxFilterSettings::make<DemuxFilterSettings::Tag::ts>();
diff --git a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
index 8525b4f..2d7be9e 100644
--- a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
+++ b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
@@ -689,11 +689,11 @@
                 bool isTsSet = false;
                 switch (subType) {
                     case FilterSubTypeEnum::UNDEFINED:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::UNDEFINED);
                         break;
                     case FilterSubTypeEnum::SECTION:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::SECTION);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::section>(
                                 readSectionFilterSettings(filterConfig));
@@ -701,46 +701,46 @@
                         break;
                     case FilterSubTypeEnum::PES:
                         // TODO: b/182519645 support all the filter settings
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::PES);
                         break;
                     case FilterSubTypeEnum::TS:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::TS);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
                         isTsSet = true;
                         break;
                     case FilterSubTypeEnum::PCR:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::PCR);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
                         isTsSet = true;
                         break;
                     case FilterSubTypeEnum::TEMI:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::TEMI);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
                         isTsSet = true;
                         break;
                     case FilterSubTypeEnum::AUDIO:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::AUDIO);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::av>(
                                 readAvFilterSettings(filterConfig));
                         isTsSet = true;
                         break;
                     case FilterSubTypeEnum::VIDEO:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::VIDEO);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::av>(
                                 readAvFilterSettings(filterConfig));
                         isTsSet = true;
                         break;
                     case FilterSubTypeEnum::RECORD:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
                                 DemuxTsFilterType::RECORD);
                         ts.filterSettings.set<DemuxTsFilterSettingsFilterSettings::Tag::record>(
                                 readRecordFilterSettings(filterConfig));
@@ -766,11 +766,11 @@
                 bool isMmtpSet = false;
                 switch (subType) {
                     case FilterSubTypeEnum::UNDEFINED:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::UNDEFINED);
                         break;
                     case FilterSubTypeEnum::SECTION:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::SECTION);
                         mmtp.filterSettings
                                 .set<DemuxMmtpFilterSettingsFilterSettings::Tag::section>(
@@ -778,40 +778,40 @@
                         isMmtpSet = true;
                         break;
                     case FilterSubTypeEnum::PES:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::PES);
                         // TODO: b/182519645 support all the filter settings
                         break;
                     case FilterSubTypeEnum::MMTP:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::MMTP);
                         mmtp.filterSettings.set<DemuxMmtpFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
                         isMmtpSet = true;
                         break;
                     case FilterSubTypeEnum::AUDIO:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::AUDIO);
                         mmtp.filterSettings.set<DemuxMmtpFilterSettingsFilterSettings::Tag::av>(
                                 readAvFilterSettings(filterConfig));
                         isMmtpSet = true;
                         break;
                     case FilterSubTypeEnum::VIDEO:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::VIDEO);
                         mmtp.filterSettings.set<DemuxMmtpFilterSettingsFilterSettings::Tag::av>(
                                 readAvFilterSettings(filterConfig));
                         isMmtpSet = true;
                         break;
                     case FilterSubTypeEnum::RECORD:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::RECORD);
                         mmtp.filterSettings.set<DemuxMmtpFilterSettingsFilterSettings::Tag::record>(
                                 readRecordFilterSettings(filterConfig));
                         isMmtpSet = true;
                         break;
                     case FilterSubTypeEnum::DOWNLOAD:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::mmtpFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::mmtpFilterType>(
                                 DemuxMmtpFilterType::DOWNLOAD);
                         // TODO: b/182519645 support all the filter settings
                         break;
@@ -834,18 +834,18 @@
                 DemuxIpFilterSettings ip;
                 switch (subType) {
                     case FilterSubTypeEnum::UNDEFINED:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                                 DemuxIpFilterType::UNDEFINED);
                         break;
                     case FilterSubTypeEnum::SECTION:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                                 DemuxIpFilterType::SECTION);
                         ip.filterSettings.set<DemuxIpFilterSettingsFilterSettings::Tag::section>(
                                 readSectionFilterSettings(filterConfig));
                         settings.set<DemuxFilterSettings::Tag::ip>(ip);
                         break;
                     case FilterSubTypeEnum::NTP:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                                 DemuxIpFilterType::NTP);
                         ip.filterSettings.set<DemuxIpFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
@@ -860,14 +860,14 @@
                         break;
                     }
                     case FilterSubTypeEnum::IP_PAYLOAD:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                                 DemuxIpFilterType::IP_PAYLOAD);
                         ip.filterSettings.set<DemuxIpFilterSettingsFilterSettings::Tag::noinit>(
                                 true);
                         settings.set<DemuxFilterSettings::Tag::ip>(ip);
                         break;
                     case FilterSubTypeEnum::PAYLOAD_THROUGH:
-                        type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::ipFilterType>(
+                        type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
                                 DemuxIpFilterType::PAYLOAD_THROUGH);
                         ip.filterSettings.set<DemuxIpFilterSettingsFilterSettings::Tag::noinit>(
                                 true);