Fix for package name

Because original code generates a lot of same name buffers.