Renamed some packages

The package name must be in the singular form.