r minor naming fixes