Fixed: Added back package names in certain places where they were helpful (see JENKINS-19217)