Shutdown message queue on application shutdown

Gracefully shutdown message queue on application shutdown + naming cosmetics