Lots of renamed funcs and structures. More readability.