Merging two contribution, naming conventions for constants