rename @fn and @fni to @def and @fn