More renaming to make code shorter.
Signed-off-by: NStanislaw Gruszka <sgruszka@redhat.com>