diff --git a/neuron/axon.md b/neuron/axon.md
index 27ae2f7..cc6dac0 100644
--- a/neuron/axon.md
+++ b/neuron/axon.md
@@ -100,7 +100,7 @@ container: PRESYNAPSE
 
 ### ms: behaviors
 
-#### PRESYNAPSE_Status: check_tpc
+#### PRE_Status_ms: check_tpc
 
 Il rilascio di NT lo facciamo nel contesto di AP. Biologicamente dovrebbe avvenire solo in base alle concentrazioni, quindi anche al difuori degli AP.
 
@@ -111,7 +111,7 @@ Questo poi per permettere la diversa contestualizzazione degli episodi di NTrele
 ![nt-release.png](.attachments/nt-release.png)
 
 ```Gen
-check_tpc: PRESYNAPSE_Status
+check_tpc: PRE_Status_ms
   contained_by: PRESYNAPSE
 
   in_context: AP
@@ -217,10 +217,10 @@ Abbiamo il caso di clearance nel contesto di un AP e non nel contesto di AP, per
 interacting: AP-CaClearanceHigh
   contained_by: PRESYNAPSE
 
-  in_context: Ca2+Full
+  in_context: AP
   rf: ( active: 3x ) # High
 
-  hypothesis: NOT (Ca2+ empty)
+  hypothesis: (Ca2+ fullness)
     action: [Ca2+ decrease]
     trace: None
 ```
@@ -231,10 +231,10 @@ interacting: AP-CaClearanceHigh
 interacting: AP-CaClearanceMediumness
   contained_by: PRESYNAPSE
 
-  in_context: Ca2+Mediumness
+  in_context: AP
   rf: ( active: 6x ) # mediumness
 
-  hypothesis: NOT (Ca2+ empty)
+  hypothesis: (Ca2+ mediumness)
     action: [Ca2+ decrease]
     trace: None
 ```
@@ -263,11 +263,13 @@ The result is that Tr_Ca encodes not the instantaneous calcium level but the rec
 
 ##### CaTracesAccumulationFast: interacting
 
+Qui le tracce CaTrace si accumulano di piu' perche' RF e' minore, se c'e' la condizione, perche' va a fare il controllo piu' spesso.
+
 ```Gen
 interacting: CaTracesAccumulationFast
   contained_by: PRESYNAPSE
 
-  in_context: Ca2+Full
+  in_context: NOT AP
   rf: ( active: 12x ) # fast
 
   hypothesis: (Ca2+ fullness)
@@ -281,7 +283,7 @@ interacting: CaTracesAccumulationFast
 interacting: CaTracesAccumulationSlow
   contained_by: PRESYNAPSE
 
-  in_context: Ca2+Full
+  in_context: NOT AP
   rf: ( active: 24x ) # Slow
 
   hypothesis: (Ca2+ mediumness)
@@ -291,15 +293,15 @@ interacting: CaTracesAccumulationSlow
 
 ### sec: behaviors
 
-#### CheckConditionsPreSec: check_tpc
+#### PRE_Status_sec: check_tpc
 
 Contestualizziamo in maniera Fixed ogni mezzo secondo?
 
 ```Gen
-check_tpc: CheckConditionsPreSec
+check_tpc: PRE_Status_sec
   contained_by: PRESYNAPSE
 
-  in_context: Fixed
+  in_context: NOT AP
   rf: ( active: 600x )
 
   condition: NOT (RP empty) AND NOT (RRP full)