Be consistent with constant naming