#1019 Improved naming of some constants