Rename RfEntry and fix sig of TransportEntry