diff --git a/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java b/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
index 949ee5c..4a5dd4f 100644
--- a/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
+++ b/staticlibs/device/com/android/net/module/util/ServiceConnectivityJni.java
@@ -48,7 +48,7 @@
      * @param timeMs target time
      * @throws IOException if setting expiration time is failed.
      */
-    public static native void setTime(int fd, long timeMs) throws IOException;
+    public static native void setTimerFdTime(int fd, long timeMs) throws IOException;
 
     /** Create tun/tap interface */
     public static native int createTunTap(boolean isTun, boolean hasCarrier,
diff --git a/staticlibs/device/com/android/net/module/util/TimerFdUtils.java b/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
index aff75f4..10bc595 100644
--- a/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
+++ b/staticlibs/device/com/android/net/module/util/TimerFdUtils.java
@@ -44,7 +44,7 @@
      */
     static boolean setExpirationTime(int fd, long expirationTimeMs) {
         try {
-            ServiceConnectivityJni.setTime(fd, expirationTimeMs);
+            ServiceConnectivityJni.setTimerFdTime(fd, expirationTimeMs);
         } catch (IOException e) {
             Log.e(TAG, "setExpirationTime failed", e);
             return false;
diff --git a/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp b/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
index cf50306..365057a 100644
--- a/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
+++ b/staticlibs/native/serviceconnectivityjni/com_android_net_module_util_ServiceConnectivityJni.cpp
@@ -51,9 +51,7 @@
 
 namespace android {
 
-static jint
-com_android_net_module_util_ServiceConnectivityJni_createTimerFd(JNIEnv *env,
-                                                       jclass clazz) {
+static jint createTimerFd(JNIEnv *env, jclass clazz) {
   int tfd;
   tfd = timerfd_create(CLOCK_BOOTTIME, 0);
   if (tfd == -1) {
@@ -62,9 +60,7 @@
   return tfd;
 }
 
-static void
-com_android_net_module_util_ServiceConnectivityJni_setTime(JNIEnv *env, jclass clazz,
-                                                 jint tfd, jlong milliseconds) {
+static void setTimerFdTime(JNIEnv *env, jclass clazz, jint tfd, jlong milliseconds) {
   struct itimerspec new_value;
   new_value.it_value.tv_sec = milliseconds / MSEC_PER_SEC;
   new_value.it_value.tv_nsec = (milliseconds % MSEC_PER_SEC) * NSEC_PER_MSEC;
@@ -75,7 +71,7 @@
 
   int ret = timerfd_settime(tfd, 0, &new_value, NULL);
   if (ret == -1) {
-    jniThrowErrnoException(env, "setTime", ret);
+    jniThrowErrnoException(env, "setTimerFdTime", ret);
   }
 }
 
@@ -185,10 +181,8 @@
  */
 static const JNINativeMethod gMethods[] = {
     /* name, signature, funcPtr */
-    {"createTimerFd", "()I",
-     (void *)com_android_net_module_util_ServiceConnectivityJni_createTimerFd},
-    {"setTime", "(IJ)V",
-     (void *)com_android_net_module_util_ServiceConnectivityJni_setTime},
+    {"createTimerFd", "()I", (void *)createTimerFd},
+    {"setTimerFdTime", "(IJ)V", (void *)setTimerFdTime},
     {"setTunTapCarrierEnabled", "(Ljava/lang/String;IZ)V", (void*)setTunTapCarrierEnabled},
     {"createTunTap", "(ZZZLjava/lang/String;)I", (void*)createTunTap},
     {"bringUpInterface", "(Ljava/lang/String;)V", (void*)bringUpInterface},