fix "each" and some typo
rename plugins