Fixing package name issues