diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
index a0666e16ead8e384ab07e7927a91b5f0d1e74261..65683b20532663f28d3a2708f06b9ebec64d06cd 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarBlockTypes.sysml
@@ -6,13 +6,13 @@ package AvatarBlockTypes {
 
 	abstract attribute def '#AvatarDataType';
 	part def '#AvatarBlock'{
-		item localClock : Clock redefines localClock = systemClock ;
+		item localClock : Clock redefines localClock = '#systemClock' ;
 	}
 	abstract action def '#AvatarMethod';
     action def '#AvatarVoidMethod' :> '#AvatarMethod';
     calc def '#AvatarCalcMethod' :> '#AvatarMethod';
 	state def '#AvatarStateMachine'{
-		item localClock : Clock redefines localClock = systemClock ;
+		item localClock : Clock redefines localClock = '#systemClock' ;
 	}
 	action def '#ReceiveAction';
 	action def '#TransitionAction';
@@ -24,7 +24,7 @@ package AvatarBlockTypes {
        protected calc '@pool' : '#PoolGen' default { '#immediate_request' };
 	   protected action '@state_action' default '#nop';
 
-		item localClock : Clock redefines localClock = systemClock ;
+		item localClock : Clock redefines localClock = '#systemClock' ;
 	    // the request '@pool'
 	    private state the_state : '#AvatarState' = self;
 	    private part request_pool : '#RequestPool'{
diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
index 6124eac4b7492669d0af21dc6da52bc7b6c7b73c..c293ae31b501b561b83e0334d041ca0a9cc587e7 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarGeneral.sysml
@@ -167,7 +167,7 @@ package AvatarGeneral {
     
     // SYSTEM SHARED CLOCK FOR DISCRETE TIME ================================
     
-	item systemClock : Clock { 
+	item '#systemClock' : Clock { 
 		doc /* a system level discrete clock to handle delays */
 		currentTime : Integer redefines currentTime;
 	}
diff --git a/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml b/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
index ae41944900d1aa306a03748ac99c823491d79715..d0c3ab927767b57adbde8508d67321168ef44563 100644
--- a/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
+++ b/src/main/java/avatartranslator/tosysmlv2/static/AvatarTransitionServer.sysml
@@ -44,7 +44,7 @@ package AvatarTransitionServer {
    			 * the system discrete clock.
    			 */
 	    
-	    item localClock : Clock redefines localClock = systemClock ;
+	    item localClock : Clock redefines localClock = '#systemClock' ;
 	    readonly attribute '@delay' : Positive default 0;
 	    derived attribute trigger_at = TimeOf(clock=localClock, o=self) + '@delay';
 
@@ -173,7 +173,7 @@ package AvatarTransitionServer {
 		 * ends (which pools and which responses depends on channel types).
 		 */
 		 
-		item localClock : Clock redefines localClock = systemClock ;
+		item localClock : Clock redefines localClock = '#systemClock' ;
 		private individual item def Kill { doc /* type of the local kill signal */ }
 		private individual item kill : Kill {
 		 	doc /* The local kill signal to be sent to '@delay'ed requests when