Merge changes Ic01bdfb0,Ie03fa9fe into main

* changes:
  Capitalize all `val`s in `companion object`s
  Add query-logic to the [MotionSpec] #MotionMechanics