Added more generic keywords
Changed name to names where applicable
Trying to get past this merge