The new, clearer names for external displays need to be in-sync.

Change-Id: Id78d359b08f956579e9226d00515cd959d81a17f