Constants were renamed
Conflict resolved