Rename and small tweaks for uwsgi