more renames; lfp code still runs