Updated generic names