Change to use generic names.