Revert patch removing 'V' prefix for classes