rnndb/pm/nva3: Make names conform with diagram