Modified any classes and application names. fixed #8