Fix identifiers for RV2 (Fixes #1)