Merge "Use name instead of package name"