Fix some more package names that weren't following convention.