make links naming more appropriate