 
 (defn make-entity
   [entity-map]
-  (assoc entity-map :id (get-next-entity-id)))
+  (assoc entity-map :entity/id (get-next-entity-id)))
 
 (s/fdef make-entity
   :ret :entity/entity)
 
 (defn make-input
   []
-  {:intended-move-direction #{}
-   :intended-fire-direction []})
+  #:input {:intended-move-direction #{}
+           :intended-fire-direction []})
 
 (s/fdef make-input
   :ret :component/input)

    #:component {:shape     {:shape/width  25
                             :shape/height 25
                             :shape/type   :rectangle
                             :shape/center {:x x :y y}}
                 :motion    {:motion/velocity             {:x 0 :y 0}
                             :motion/affected-by-friction true
                             :motion/direction            nil
                             :motion/max-acceleration     1.5

    #:component {:shape     {:shape/width  25
                             :shape/height 25
                             :shape/type   :rectangle
                             :shape/center {:geometry/x x
                                            :geometry/y y}}
                 :motion    {:motion/velocity             {:geometry/x 0
                                                           :geometry/y 0}
                             :motion/affected-by-friction true
                             :motion/direction            nil
                             :motion/max-acceleration     2.0
