Use PKGNAMESUFFIX=4 consistently