fixed naming of State pattern