Refactoring for link anchor naming convention