Modified count calculation and fixed nomenclature usage