General name fixes.