Namespace cleanup.
Change hint path for Leap binaries.