Small module rename and fix

I will probably remove these "modules" they have too many external
dependencies.

Or I will re-code them to be a bit more flexible.