incorrect arrays allocated leading to null pointer

[skoren]

This was causing a crash on my run, I think the names should match the if check above in each block.

[cschin]

@skoren thanks for getting this bug.