diff --git a/config.c b/config.c
index ad74201..4c79d56 100644
--- a/config.c
+++ b/config.c
@@ -785,11 +785,11 @@ int get_global_config(struct config *conf)
             uppercase(value);
             if ((strcmp(value,"TRUE")==0) || (strcmp(value,"1")==0))
             {
-                conf->notify_periodic_enable = true;
+                conf->periodic_notify_enable = true;
             }
             else
             {
-                conf->notify_periodic_enable = false;
+                conf->periodic_notify_enable = false;
             }
             free(value);
             value = NULL;
@@ -812,11 +812,11 @@ int get_global_config(struct config *conf)
         if(a==0)
         {
             CWMP_LOG(INFO,"Set notify period to the default value: %d",DEFAULT_NOTIFY_PERIOD);
-            conf->notify_period = DEFAULT_NOTIFY_PERIOD;
+            conf->periodic_notify_interval = DEFAULT_NOTIFY_PERIOD;
         }
         else
         {
-            conf->notify_period = a;
+            conf->periodic_notify_interval = a;
         }
     }
     else
diff --git a/event.c b/event.c
index 87adcaa..a0ee612 100644
--- a/event.c
+++ b/event.c
@@ -742,8 +742,8 @@ void *thread_periodic_check_notify (void *v)
     long int delta_time;
     int is_notify;
 
-    periodic_interval = cwmp->conf.notify_period;
-    periodic_enable = cwmp->conf.notify_periodic_enable;
+    periodic_interval = cwmp->conf.periodic_notify_interval;
+    periodic_enable = cwmp->conf.periodic_notify_enable;
 
     for(;;) {
         if (periodic_enable) {
diff --git a/inc/cwmp.h b/inc/cwmp.h
index 093f9f4..2759f06 100644
--- a/inc/cwmp.h
+++ b/inc/cwmp.h
@@ -80,8 +80,8 @@ extern unsigned int end_session_flag;
 #define UCI_CPE_INSTANCE_MODE				"cwmp.cpe.instance_mode"
 #define UCI_CPE_SESSION_TIMEOUT				"cwmp.cpe.session_timeout"
 #define UCI_CPE_EXEC_DOWNLOAD				"cwmp.cpe.exec_download"
-#define UCI_CPE_NOTIFY_PERIODIC_ENABLE		"cwmp.cpe.notify_periodic_enable"
-#define UCI_CPE_NOTIFY_PERIOD				"cwmp.cpe.notify_period"
+#define UCI_CPE_NOTIFY_PERIODIC_ENABLE		"cwmp.cpe.periodic_notify_enable"
+#define UCI_CPE_NOTIFY_PERIOD				"cwmp.cpe.periodic_notify_interval"
 #define LW_NOTIFICATION_ENABLE              "cwmp.lwn.enable"
 #define LW_NOTIFICATION_HOSTNAME            "cwmp.lwn.hostname"
 #define LW_NOTIFICATION_PORT                "cwmp.lwn.port"
@@ -191,11 +191,11 @@ typedef struct config {
     char                                *ubus_socket;
     int                                 connection_request_port;
     int                                 period;
-    int 								notify_period;
+    int 								periodic_notify_interval;
     int                                 compression;
     time_t                              time;
     bool                                periodic_enable;
-    bool                                notify_periodic_enable;
+    bool                                periodic_notify_enable;
     bool                                insecure_enable;
     bool								ipv6_enable;
 	int 								retry_min_wait_interval;