Some renamings for @bgotink