Another attempt to fix various name/value issues.