Fix: Typos; Adjust String names;