At least up until a couple of years ago, the acceptable term for the first kind of DRM you describe was "Digital Asset Management," which kind of eliminates the confusion altogether. You should have remembered that from that research project you had me do...
Semantic nitpick