Remove 'References' from mappings and selectors
Merge pull request #750 from reciprocity/feature/remove-mapped-references

Remove 'References' from mappings and selectors