Added support for shell expansion in naming of unit files