http: rename several generator functions