Additional updates from rename of 'WSGI' to 'Web'