Finished rectifying some nomenclature issues.