Rename structure.
fix
Fix validation.