Fix some random name issues