a7f6018 more missing patch, and rename

Authored and Committed by mtasaka 10 years ago
    more missing patch, and rename