A few last data cleanups, I hope
a few more name fixes