Merge "Fix inconsistent package name."