Small name fixes.