Minor update to rename variables for clarity.
Minor code cleanup along with new finder for detection points from
server-side config. The lookups are cached to boost performance.