Fixed a variety of name and association issues. Fixes #70