fixed references to new constants