Well, I'll rewrite it with asm from the scratch. So It should be free from variable/function name problem.
And of course I'm using debugger almost everytime along with cpp source and compiler produced asm source. Compiler produced asm source has name information so it's worth to take a look.