Update remaining references to RFC 2616, tune terminology