http1 renames & some more configurability