Rename cogito.type to cogito.invoker.type. Plus cleanups