Changed names - was causing problems with gunicorn