Edited some names