some name fixes.