Fixing class name
Moving to 2.0 API