Fix some more defects.

Fix the name