The way I see it is that development does not start the second you put the eggs in the incubator, it takes a minimum amount of time for heat to penetrate the egg fully and trigger development in the first place. So counting set day as day 1 does not make sense to me, personally. 21 days is 3 weeks. If you open up a calendar and count 3 weeks from the first of the month, you land on the 22nd, not the 21st, because the 22nd is 21 days after the first of the month. The day you started on is not included in the count, in other words.
But, in the long run, it actually... doesn't really matter all that much! Lock down does not have to strictly happen on day 18 regardless of how you count it. After all, you can find stories of people who forgot to lock down their eggs and had them hatch just fine on day 21, in running turners without humidity turned up or anything. And on the flip side, turning the eggs is only really 
crucial in the first 2 weeks or so, if I remember correctly, so 
technically you could lock down as early as day 15 and not have any issues. Basically, as long as you've got the temperature right in your incubator, pretty much everything else in incubating chicken eggs has a lot more wiggle room than people think.
So I guess long story short, count however you feel is right. If it has worked fine for you, then obviously there's nothing wrong with how you're doing it.