Simplified package-names in example