Lots of renamed funcs and structures.