repositioned fields and fixed name attr