Improve anchor positioning and naming