Merge "Update nomenclature." into jb-mr2-dev