Update README, standardize naming.