Change variables names and security.

Signed-off-by: Kiril Nesenko <knesenko@redhat.com>