moved some of the magic words to constants files.