Moved materials, changed names of entities/geometry