refactor mappings to correct assosiations