Use the proper non-dev package name for the source package
Update more places with the correct source package name