Update names for constatnts