Fixed some abbreviations.
Touching all these files so they get updated.
Finished up some cd to code refactoring.