[FIX] Fix names and state