Remove and add most of the names.

Add most of the names.