tools: make some variable names more clear

Change-Id: I5eb2428f4c71e5aa9bfc0bf71c06d87be039ad3b