Change package name and add precaution