name and alignment fix