stracture and names changes