Fix suffix in names