Fix some typos and correct layers names