No more 'riname', uses class instead
No more 'riname', uses class instead