Updated product names to match executable names