Make sure we use the right wsgi app and use more consistent var names