added CLIENT_ prefix to event states