Fixed issues with relationship fields getting the wrong field naming convention.