Untangling all the world generation object names and such so they
actually make sense.