Update README, other name fixes