Fix package_name to account for dashes in name