Changes in names of variables, functions, and comments (due to recent changes and old ones)

Summary: Some changes were made in names of variables, functions, and comments (due to recent changes and also old ones).

The recent related code review can be seen on https://phabricator.kde.org/D27259

Differential Revision: https://phabricator.kde.org/D27446