More renaming, with some reorganising as well