Tidying up after name change.