conform South Africa source to naming convention