Fixed item names.
We need to add l10n… do you want to look into that or shall I?