Fix typos
Add some names
Add ambiguity
Add some names