Variables should have module name as prefix to prevent collisions.

Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524