Enhanced alias replacement