Rename classes; change versioning from 1.1 to 2.