Constant naming cleanup.