Small fix to the bundle filename and class name