Fixing typos and workaround for issue with name linking.

Can't reproduce the name linking issue with just my user in my testing account, but.. this should fix it hopefully :)