diff --git a/neuron/soma.md b/neuron/soma.md
index e66445f..7a4e703 100644
--- a/neuron/soma.md
+++ b/neuron/soma.md
@@ -39,12 +39,12 @@ Qui comprendiamo:
 — ms:
 
 - based on VDB, VGSC open and let Na+ in. VGSG then go into refractory
-- if Na fullness then AP. Here the threshold is based only on the integration of Na+
+- if Na fullness then ApCtx. Here the threshold is based only on the integration of Na+
 - increase SpikeTrainTraces (fast at spike)
 - increase Ca2+ traces
 - decrease Na: fast pump which decreases Na+, we do not model K+
 -- there is a tug of war between Na entering and exiting. Na can reach fullness only if VDB increases fast (derivative)
-- there are 2 context: AP and RefractorySoma imlemented with timers and tunable
+- there are 2 context: ApCtx and RefractorySoma imlemented with timers and tunable
 - decrease SpikeTraintraces slow, only if away from spiketrain this is empty
 
 - Tune:
@@ -67,10 +67,6 @@ Qui comprendiamo:
 
 - **Na**: are a proxy for the Coulombs of charge building up on the somatic membrane. They are used to check threshold, but also to mimic Na+ and K+ pumping
 
-- **AP**:
-
-- **bAP**:
-
 - **Ca2+**: Medium term traces to guide tuning and Night development. It is a local trace, ATP is a global (Astrocyte)
 
 - **SpikeTrainTraces**: sono le tracce che consentono al neurone di far partire il Tuning neuronale, quando e' lontano da uno spike-train, ovvero e' in riposo.
@@ -105,43 +101,43 @@ container: SOMA
 
 ### ms: SOMA
 
-#### CheckVDB: Interacting
+#### CheckVDB: Episode
 
 As dendrites deliver current (VDB​), the soma acts like a capacitor. It "stores" this charge in the form of membrane potential. This contextualizes VGSC-SOMA to open ion channels that let Na+ ions in.
 
-This only applies if not AP, or in other words, SOMA is not in refractory period.
+This only applies if not ApCtx, or in other words, SOMA is not in refractory period.
 
 ```Gen
-interacting: CheckVDB
+episode: CheckVDB
   contained_by: SOMA
 
   context: Fixed
   rf: ( active: 60x )
 
-  condition: (VDB fullness ) AND NOT AP
+  condition: (VDB fullness ) AND NOT ApCtx
     out_context: VDBMax
 
-  condition: ( VDB mediumness ) AND NOT AP
+  condition: ( VDB mediumness ) AND NOT ApCtx
     out_context: VDBMedium 
 
-  condition: ( VDB emptiness ) AND NOT AP
+  condition: ( VDB emptiness ) AND NOT ApCtx
     out_context: VDBLow
 ```
 
-#### CheckSomaSpike: Interacting
+#### SomaSpike: Episode
 
 Qui siamo nella fase effettiva di spike, non refractory che viene dopo. Fa da contesto di durata fra un RF ed un altro.
 
 ```Gen
-interacting: CheckSomaSpike
+episode: SomaSpike
   contained_by: SOMA
 
   context: Fixed
   rf: ( active: 60x )
 
   condition: ( Na fullness ) AND ( NOT SomaRefractory )
-    out_context: AP
-    out_context: bAP
+    out_context: ApCtx
+    out_context: bApCtx
 ```
 
 #### APInteracting: Interacting
@@ -152,7 +148,7 @@ Durante la fase effettiva di spike, eliminiamo Na accumulati e riempiamo per fas
 interacting: APInteracting
   contained_by: SOMA
 
-  context: AP
+  context: ApCtx
   rf: ( active: 8x )
 
  hypothesis: NOT Na empty
@@ -200,10 +196,10 @@ tuner: VGSC-SOMA-TUN
  tub_intricated:
 ```
 
-##### Check: Context
+##### Check: Episode
 
 ```Gen
-context: Check
+context: episode
   contained_by: VGSC-SOMA-TUN
 
   context: TunPossible
@@ -259,12 +255,12 @@ interacting: NaEnterH
     trace: None
 ```
 
-##### CheckRefractoryH: Context
+##### CheckRefractoryH: Episode
 
 Il check su refractory deve essere fatto ad un RF maggiore della eliminazione di Refractory. Questo perche' e' un era nella qualle avviene l'episodio.
 
 ```Gen
-context: CheckRefractoryH
+episode: CheckRefractoryH
   contained_by: VGSC-H-SOMA
 
   context: NOT RefractoryH