Remove more references to the old 'web' package/namespace.