Improve variable and method names

Signed-off-by: Igor Popov <igor.popov89@gmail.com>