Fixed from name issues