everest: change identifiers for compat

Change-Id: I7c717c3fc3e24d9e8818fe30d932a6b71eeeaf4f