More name fixes, etc.