! Fix broken stuff, ! Rename class