Renamed a few packages

The status query returns a sensible set of results now