improve const names