User/derekkg/namefix

Fixes #32