Rename variables in attempt to make the matching/overlap algorithm a bit less confusing.