Targetzip name building refactoring