Simplify names of classes and bump build number to 2.0.0

This completely breaks with the 1.0.0 API.