Revert "Strip prefixes from types"

This reverts commit ccdb02f661bef962568dd9a33c5eb9cb10fee4e3.

I'm not sure this is the right way to go just yet
Bump dependencies