Cleanup package name