 
 (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)


(s/def :entity/id int?)

(s/def :geometry/x (s/and number? pos?))
(s/def :geometry/y (s/and number? pos?))
(s/def :geometry/vector2 (s/keys :req [:geometry/x :geometry/y]))
(s/def :geometry/direction (s/nilable number?))


                                       :weapon/fire-direction
                                       :weapon/shots-per-second
                                       :weapon/shot-speed
                                       :weapon/projectile-color
                                       :weapon/projectile-shape]))

(s/def :collision/type #{:good-guy
                         :bad-guy
                         :obstacle
                         :trap
                         :projectile
