Fixed package name issues