diff -r 18ed0f3b030a -r 4715f4ed8e0c src/states.c
--- a/src/states.c	Mon Oct 01 19:18:35 2012 +0200
+++ b/src/states.c	Tue Oct 02 21:45:24 2012 +0200
@@ -92,7 +92,7 @@
 				proceedSDO(d,m);
 			break;
 		case NODE_GUARD:
-			if (d->CurrentCommunicationState.csHeartbeat)
+			if (d->CurrentCommunicationState.csLifeGuard)
 				proceedNODE_GUARD(d,m);
 			break;
 		case NMT:
@@ -142,7 +142,7 @@
 #endif
 	StartOrStop(csSDO,	None,		resetSDO(d))
 	StartOrStop(csSYNC,	startSYNC(d),		stopSYNC(d))
-	StartOrStop(csHeartbeat,	heartbeatInit(d),	heartbeatStop(d))
+	StartOrStop(csLifeGuard,	lifeGuardInit(d),	lifeGuardStop(d))
 	StartOrStop(csEmergency,	emergencyInit(d),	emergencyStop(d)) 
 	StartOrStop(csPDO,	PDOInit(d),	PDOStop(d))
 	StartOrStop(csBoot_Up,	None,	slaveSendBootUp(d))