Naming consistency: Use "tools" instead of "aids" everywhere

Change-Id: I107ed8ff28bd5e1737607034a52a7c19592f8d8b