Change some key to plural forms