FORMAT_NAME vs. ALGORITHM_NAME fixes.