Various renamings and extensions