Fixed class names in hbm files