Trim trailing nonprintables from product name

Directory name looks better without trailing spaces (and other nonsense)

Reduce copy&paste a little bit too