Fix bundle constants according to class rename in 88635c6