Some tidy-up after previous renaming