fix name
put the pieces in the right places