diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSubType.aidl
similarity index 97%
rename from tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl
rename to tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSubType.aidl
index 2aa3a89..2e2a774 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterSubType.aidl
@@ -34,7 +34,7 @@
 package android.hardware.tv.tuner;
 /* @hide */
 @VintfStability
-union DemuxFilterTypeDemuxFilterSubType {
+union DemuxFilterSubType {
   android.hardware.tv.tuner.DemuxTsFilterType tsFilterType = android.hardware.tv.tuner.DemuxTsFilterType.UNDEFINED;
   android.hardware.tv.tuner.DemuxMmtpFilterType mmtpFilterType;
   android.hardware.tv.tuner.DemuxIpFilterType ipFilterType;
diff --git a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterType.aidl b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterType.aidl
index 14f9202..b2f499d 100644
--- a/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterType.aidl
+++ b/tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/DemuxFilterType.aidl
@@ -36,5 +36,5 @@
 @VintfStability
 parcelable DemuxFilterType {
   android.hardware.tv.tuner.DemuxFilterMainType mainType = android.hardware.tv.tuner.DemuxFilterMainType.UNDEFINED;
-  android.hardware.tv.tuner.DemuxFilterTypeDemuxFilterSubType subType;
+  android.hardware.tv.tuner.DemuxFilterSubType subType;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSubType.aidl
similarity index 94%
rename from tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl
rename to tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSubType.aidl
index cf1a59c..3dfc0ae 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterTypeDemuxFilterSubType.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterSubType.aidl
@@ -23,10 +23,11 @@
 import android.hardware.tv.tuner.DemuxTsFilterType;
 
 /**
+ * The different Demux Filter Sub Types.
  * @hide
  */
 @VintfStability
-union DemuxFilterTypeDemuxFilterSubType {
+union DemuxFilterSubType {
     DemuxTsFilterType tsFilterType = DemuxTsFilterType.UNDEFINED;
 
     DemuxMmtpFilterType mmtpFilterType;
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterType.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterType.aidl
index 38348b6..f5eda60 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterType.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/DemuxFilterType.aidl
@@ -17,7 +17,7 @@
 package android.hardware.tv.tuner;
 
 import android.hardware.tv.tuner.DemuxFilterMainType;
-import android.hardware.tv.tuner.DemuxFilterTypeDemuxFilterSubType;
+import android.hardware.tv.tuner.DemuxFilterSubType;
 
 /**
  * Demux Filter Type.
@@ -27,5 +27,5 @@
 parcelable DemuxFilterType {
     DemuxFilterMainType mainType = DemuxFilterMainType.UNDEFINED;
 
-    DemuxFilterTypeDemuxFilterSubType subType;
+    DemuxFilterSubType subType;
 }
diff --git a/tv/tuner/aidl/android/hardware/tv/tuner/ITuner.aidl b/tv/tuner/aidl/android/hardware/tv/tuner/ITuner.aidl
index f881082..ab8b0b8 100644
--- a/tv/tuner/aidl/android/hardware/tv/tuner/ITuner.aidl
+++ b/tv/tuner/aidl/android/hardware/tv/tuner/ITuner.aidl
@@ -22,7 +22,6 @@
 import android.hardware.tv.tuner.IDescrambler;
 import android.hardware.tv.tuner.IFrontend;
 import android.hardware.tv.tuner.ILnb;
-import android.hardware.tv.tuner.FrontendDtmbCapabilities;
 
 /**
  * Top level interface to manage Frontend, Demux and Decrambler hardware