diff --git a/services/core/java/com/android/server/radio/Tuner.java b/services/core/java/com/android/server/radio/Tuner.java
index 9915c34fb5823..38f16d536cb12 100644
--- a/services/core/java/com/android/server/radio/Tuner.java
+++ b/services/core/java/com/android/server/radio/Tuner.java
@@ -37,7 +37,7 @@ class Tuner extends ITuner.Stub {
     private final Object mLock = new Object();
     private boolean mIsClosed = false;
     private boolean mIsMuted = false;
-    private int mRegion;  // TODO(b/36863239): find better solution to manage regions
+    private int mRegion;  // TODO(b/62710330): find better solution to handle regions
     private final boolean mWithAudio;
 
     Tuner(@NonNull ITunerCallback clientCallback, int halRev, int region, boolean withAudio) {
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index a3d28bbd37548..3c5779e3a670b 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -24,7 +24,7 @@ LOCAL_SRC_FILES += \
     $(LOCAL_REL_DIR)/com_android_server_power_PowerManagerService.cpp \
     $(LOCAL_REL_DIR)/com_android_server_radio_RadioService.cpp \
     $(LOCAL_REL_DIR)/com_android_server_radio_Tuner.cpp \
-    $(LOCAL_REL_DIR)/com_android_server_radio_Tuner_TunerCallback.cpp \
+    $(LOCAL_REL_DIR)/com_android_server_radio_TunerCallback.cpp \
     $(LOCAL_REL_DIR)/com_android_server_radio_convert.cpp \
     $(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \
     $(LOCAL_REL_DIR)/com_android_server_storage_AppFuseBridge.cpp \
diff --git a/services/core/jni/com_android_server_radio_Tuner.cpp b/services/core/jni/com_android_server_radio_Tuner.cpp
index 1e97e66317f46..2819e1237037f 100644
--- a/services/core/jni/com_android_server_radio_Tuner.cpp
+++ b/services/core/jni/com_android_server_radio_Tuner.cpp
@@ -20,7 +20,7 @@
 #include "com_android_server_radio_Tuner.h"
 
 #include "com_android_server_radio_convert.h"
-#include "com_android_server_radio_Tuner_TunerCallback.h"
+#include "com_android_server_radio_TunerCallback.h"
 
 #include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>
 #include <core_jni_helpers.h>
diff --git a/services/core/jni/com_android_server_radio_Tuner_TunerCallback.cpp b/services/core/jni/com_android_server_radio_TunerCallback.cpp
similarity index 99%
rename from services/core/jni/com_android_server_radio_Tuner_TunerCallback.cpp
rename to services/core/jni/com_android_server_radio_TunerCallback.cpp
index a3cfeffbafcc7..8df92ae7e6671 100644
--- a/services/core/jni/com_android_server_radio_Tuner_TunerCallback.cpp
+++ b/services/core/jni/com_android_server_radio_TunerCallback.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "radio.TunerCallback.jni"
 #define LOG_NDEBUG 0
 
-#include "com_android_server_radio_Tuner_TunerCallback.h"
+#include "com_android_server_radio_TunerCallback.h"
 
 #include "com_android_server_radio_convert.h"
 #include "com_android_server_radio_Tuner.h"
diff --git a/services/core/jni/com_android_server_radio_Tuner_TunerCallback.h b/services/core/jni/com_android_server_radio_TunerCallback.h
similarity index 89%
rename from services/core/jni/com_android_server_radio_Tuner_TunerCallback.h
rename to services/core/jni/com_android_server_radio_TunerCallback.h
index 35a4d695bef37..7d37b8742f730 100644
--- a/services/core/jni/com_android_server_radio_Tuner_TunerCallback.h
+++ b/services/core/jni/com_android_server_radio_TunerCallback.h
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-// TODO(b/36863239): rename s/_Tuner_TunerCallback/_TunerCallback/, as this
-// module is no longer a part of Tuner - it's an independent java class.
 #ifndef _ANDROID_SERVER_RADIO_TUNERCALLBACK_H
 #define _ANDROID_SERVER_RADIO_TUNERCALLBACK_H