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