Removing some types and adding some keywords
Removing more types from capitalization list