Naming convention made consistent with rnrfa