Fix/ChangeClassNames