fixing status representation problem
more changes in status naming