Several changes and renamings