Fixes name Kind

Closes #44