Naming fixups and roll version to 0.2.0