Some renaming and trying to make use of the proxy.