Renamed v2 files to proper names. Refs #29