This commit closes #11

Fixing duplicate names in types and places.