     [model action]
     (match action
            :clear-history
-           (assoc model :signals (list)
-                        :actions (list))
+           (assoc model :signal-events (list)
+                        :action-events (list))
 
            [:record-signal-event signal-event]
            (-> model
-               (update :signals concat [signal-event])
+               (update :signal-events concat [signal-event])
                (update :next-signal-id inc))
 
            [:toggle-action id]
-           (-update-action model id update :enabled? not)
+           (-update-action-event model id update :enabled? not)
 
            :replay
            ; applies enabled recorded actions to the initial component model
            (assoc model :component
                         (reduce component-reconcile
                                 (:initial-model model)
-                                (->> (:actions model)
+                                (->> (:action-events model)
                                      (filter :enabled?)
                                      (map :action))))
 

                                                                       :-unknown-signal)]
             (-> model
                 (update :component component-reconcile a)
                 (update :signals concat [unknown-signal-event])
                 (update :next-signal-id inc)
                 (update :actions concat [(-action-event singal-id (:next-action-id model) a)])
                 (update :next-action-id inc))))))

;;;;;;;;;;;;;;;;;;;;;;;; View model

           [:strong (pr-str signal)])

         (for [{:keys [id enabled? action]} (filter #(= (:signal-id %) signal-id)
                                                    (:action-events model))]
           ^{:key id}
           [:div {:style    {:cursor           "pointer"
                             :margin-left      "10px"
