Rename packageName to package_name for consistency