relation class names fixes