Changes to strcuture, names