Fix nomenclature per recent discussions
Merge remote-tracking branch 'origin/master' into nucleotide-count