Fix package names

Fix package names from previous plural or singular change.