ad name refactoring