Refer to all media and maps to as entity
Refactoring namings to entity