Changed names of environment variables.

Some have already been fixed in the mesg-broker branch.