Remove global namespace pollution

Change-Id: I4898b6088eba2cbc40fc5fc68ea20df97fcc63a8