Rename RSP
Adapted for new arity value in calls