Fix qpid package name, tidy up