Merge "Revert "Rename some failed causes""