Fix association name issue