diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index edf9b18..613b160 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -615,7 +615,7 @@
        property_set("vendor.hw.fm.mode", "normal");
        /* Need to clear the hw.fm.init firstly */
        property_set("vendor.hw.fm.init", "0");
-       property_set("ctl.start", "fm_dl");
+       property_set("ctl.start", "vendor.fm");
        sched_yield();
        for(i=0; i<45; i++) {
          property_get("vendor.hw.fm.init", value, NULL);
@@ -628,7 +628,7 @@
        }
        ALOGE("init_success:%d after %f seconds \n", init_success, 0.2*i);
        if(!init_success) {
-         property_set("ctl.stop", "fm_dl");
+         property_set("ctl.stop", "vendor.fm");
          // close the fd(power down)
          close(fd);
          return FM_JNI_FAILURE;
@@ -649,7 +649,7 @@
 
     if ((strcmp(value, "rome") != 0) && (strcmp(value, "hastings") != 0))
     {
-        property_set("ctl.stop", "fm_dl");
+        property_set("ctl.stop", "vendor.fm");
     }
     close(fd);
     return FM_JNI_SUCCESS;
