Few small adjustments to the output naming, since dots are allowed