Improve code readability, rename hasDataKey() to hasDataPackageKey()