Fixing name issues