Fix habtm pluralization