rxname fixes to address test failures, doh!