bugfix:
- fix name conflicts by similar type names.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>