Tweaked auto created names and paths