Added generalized names