Terminology update.
Terminology Update.
MOBILE-2396
MOBILE-2377
Merge pull request #197 from jmpascal/1.4-Dev

1.4 dev