Fix Gui, change class name