Extract Link Creation to separate class, and fix case-matching issue.