Fixed renaming artefacts.