Fixes following on from rename.