fix association relation naming