Fix ASM and name problems.
Merge pull request #451 from alexbegt/master

Fix ASM and name problems.