Fix clone template name parsing

Change the scripts to be a bit more restrictive wrt
template names.  Assume base name doesn't include the
delimeter \'-\', just keeps things cleaner and makes
things much more robust.