Fixed hasOne/hasMany reference to use fully-qualitied