constant naming cleanup