Small patch to bundle filename and class name