Merge "Remove use of '_' variable name"