Do not create links when recursive
Improve naming