Closes: #851651
Closes: #878611
Use the package name to infer module location. This will make it easier to script our maintaining tasks.