Improve internal naming consistency
Split out stalker logic