change names and align stuffs