You're right, it's a more global effort and strategy to design properly all constants. Do we have a JIRA for that (for 4.x)?