Merge "Use library name rather than package name for dependencies." into main