Typename preserved and included as declaration names

https://github.com/kfgodel/diamond/issues/22
Merge pull request #37 from kfgodel/22_preserve_declaration_name

22 preserve declaration name