Fix Nameing
Work on Plugin Manager