This needs to be updated too for the name/url change, I think.