renamed classes to match status