Rename accidentally duplicated fns