Revert earlier changes to example package names