NH: Fixed problem with association names