Add more generic names