Pkg3: the great bikeshed rename

Commit

7 years ago

Pkg3: the great bikeshed rename (cherry picked from commit 9f633a546f7d5fcd98312b4d6aa45d37cd24b89c)