diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index 227b2fc..3b6e663 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -44,7 +44,7 @@
 
 #define STATE_UNSELECTED 0
 #define STATE_READY 1
-#define STATE_WAIT_FOR_ACTICATION_TIME 2
+#define STATE_WAIT_FOR_ACTIVATION_TIME 2
 #define STATE_PERFORM_TEST 3
 #define STATE_WAIT_FOR_EXECUTION 4
 #define STATE_OPERATE 5
@@ -345,13 +345,13 @@ executeStateMachine:
 
     switch (state) {
 
-    case STATE_WAIT_FOR_ACTICATION_TIME:
+    case STATE_WAIT_FOR_ACTIVATION_TIME:
     case STATE_WAIT_FOR_EXECUTION:
     {
         ControlHandlerResult dynamicCheckResult = CONTROL_RESULT_OK;
         bool isTimeActivatedControl = false;
 
-        if (state == STATE_WAIT_FOR_ACTICATION_TIME)
+        if (state == STATE_WAIT_FOR_ACTIVATION_TIME)
            isTimeActivatedControl = true;
 
         if (self->waitForExecutionHandler != NULL) {
@@ -667,7 +667,7 @@ Control_processControlActions(MmsMapping* self, uint64_t currentTimeInMs)
     while (element != NULL) {
         ControlObject* controlObject = (ControlObject*) element->data;
 
-        if (controlObject->state == STATE_WAIT_FOR_ACTICATION_TIME) {
+        if (controlObject->state == STATE_WAIT_FOR_ACTIVATION_TIME) {
 
             if (controlObject->operateTime <= currentTimeInMs) {
 
@@ -1395,7 +1395,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
 
         int state = getState(controlObject);
 
-        if (state == STATE_WAIT_FOR_ACTICATION_TIME) {
+        if (state == STATE_WAIT_FOR_ACTIVATION_TIME) {
             indication = DATA_ACCESS_ERROR_TEMPORARILY_UNAVAILABLE;
 
             ControlObject_sendLastApplError(controlObject, connection, "Oper",
@@ -1452,7 +1452,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
 
                     initiateControlTask(controlObject);
 
-                    setState(controlObject, STATE_WAIT_FOR_ACTICATION_TIME);
+                    setState(controlObject, STATE_WAIT_FOR_ACTIVATION_TIME);
 
                     if (DEBUG_IED_SERVER)
                         printf("Oper: activate time activated control\n");
diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar
index 182f0d5..4ad96ab 100644
Binary files a/tools/model_generator/genmodel.jar and b/tools/model_generator/genmodel.jar differ
diff --git a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
index 6a8c8ef..ba23d76 100644
--- a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
+++ b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java
@@ -827,7 +827,7 @@ public class StaticModelGenerator {
     		sgcbString += sgcb.getActSG() + ", " + sgcb.getNumOfSGs() + ", 0, false, 0, 0, ";
     		
     		if (currentSGCBVariableNumber < (sgcbVariableNames.size() - 1))
-    			sgcbString += "&" + sgcbVariableNames.get(currentGseVariableNumber + 1);
+    			sgcbString += "&" + sgcbVariableNames.get(currentSGCBVariableNumber + 1);
     		else
     			sgcbString += "NULL";