Value and function name fixes.