RVM

Rename classes currently with VM_ prefix that will be confusing without it