Change methods that gets or sets names (not objects) and add the prefix "name".
For example in the MediaStorageInterface the method getContext should be called getContextName.
(keep the old methods to avoid breaking old code and mark them with @deprecated)