We have both in the code.  Let's use only one format.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>