Backport fr_cursor name changes