Fix handling of one letter package/vendor names