Tools build / filename cleanup.