Working through a bug where sometimes the packageName is null.  But I was also renaming things to be more descriptive or not mispelled