Reformatting/restructing/renaming specs