Change package name & fix