Fixed header search paths and product names.