Merge "Change database package name align with the directory name"