Revert + uppercase and typos

Revert + uppercase and typos