diff --git a/include/mtime_eventBasic.h b/include/mtime_eventBasic.h
index db47bb39b799fc554d72b5b3ff043cd0598950a3..8c2506eba4b505e071c1d150f541d0f26432de7d 100644
--- a/include/mtime_eventBasic.h
+++ b/include/mtime_eventBasic.h
@@ -23,10 +23,8 @@
 #include "mtime_julianDay.h"
 
 
-///provides a Maximum string length for Group Names.
-#define MAX_GROUPNAME_STR_LEN 132
 ///provides a Maximum string length for Event names.
-#define MAX_EVENTNAME_STR_LEN 132
+#define MAX_BASICEVENTNAME_STR_LEN 132
 
 struct _datetime;
 struct t_event_basic_cache;
diff --git a/src/mtime_eventBasic.c b/src/mtime_eventBasic.c
index 48e352253bab82873e963d3685ef58469345ddb0..802732e4db120b6ba04fb66aeeeb563022a9b156 100644
--- a/src/mtime_eventBasic.c
+++ b/src/mtime_eventBasic.c
@@ -254,11 +254,11 @@ newBasicEventWithDataType(const char* _en,
       int ret = 0;
 
       /* Copy event name. */
-      e->eventName = (char*)calloc(MAX_EVENTNAME_STR_LEN,sizeof(char));
+      e->eventName = (char*)calloc(MAX_BASICEVENTNAME_STR_LEN,sizeof(char));
       if (e->eventName == NULL )  goto cleanup_and_exit;
 
-      strncpy(e->eventName, _en, MAX_EVENTNAME_STR_LEN-1);
-      e->eventName[MAX_EVENTNAME_STR_LEN - 1] = '\0';
+      strncpy(e->eventName, _en, MAX_BASICEVENTNAME_STR_LEN-1);
+      e->eventName[MAX_BASICEVENTNAME_STR_LEN - 1] = '\0';
 
       /* Start Date. Default start date = "0-01-01T00:00:00.000". */
       if (eventFirstDT)
@@ -525,8 +525,8 @@ getBasicEventName(struct t_event_basic* e, char* ename)
 {
   if ((e != NULL) && (ename != NULL))
     {
-      strncpy(ename, e->eventName, MAX_EVENTNAME_STR_LEN-1);
-      ename[MAX_EVENTNAME_STR_LEN-1] = '\0';
+      strncpy(ename, e->eventName, MAX_BASICEVENTNAME_STR_LEN-1);
+      ename[MAX_BASICEVENTNAME_STR_LEN-1] = '\0';
       return ename;
     }
   else