Use consistent naming for Django REST framework#977

n2ygk merged 2 commits intodjango-json-api:masterdjango-json-api/django-rest-framework-json-api:masterfrom

sliverc:drf_namingsliverc/django-rest-framework-json-api:drf_namingCopy head branch name to clipboard