Updated to v1.1

- Changed class names