fix #595 and fix #550

Get that, just asking if that format is better than the current one, which
accomplishes the same but with less chars in the name ...