Hopefully the name chanage to constants as well