Fix conflict in constants