Revert "Rename & Edid"

This reverts commit 07e9d509ddb8aec2a534601440d9094a62b2ed71.
Revert "Revert "Rename & Edid""

This reverts commit ec391ddb3ebddb96ed9e078ebb931050e84963b5.