Refactor naming convention, links and variables.