Merge "*common: use package as name"