Renamings, updates and additions