Name cleaning up.

Doing some more research besides the forum post showed I was using the
wrong name for things.

--HG--
rename : takeuchi.S => tak.S
rename : takeuchi.c => tak.c