[SERVDEV-49] - Corrected some typos and constant names.