ECDR-XX: Code cleanup, fixing misspellings and variable naming.