Altered some names