Engine, without Wagn => Decko Rename

Merged latest master.

For discussion.
probably need this back out.