Update stubs and names
Change in arrays from a while ago
Merge branch 'master' of https://github.com/flaviut/nimrod-by-example