Merging the-big-renaming branch! Say hello to juju!
This is a massive change renaming and fixing several things on the way. Unfortunately my day is finishing and I didn't manage to get 100% of the tests passing, but there's very few things broken right now, and I don't want to keep such a massive change flying around.