Additional name fixes