Renamed EP classes to avoid confusion with core classes

Change-Id: I466e1da315112db26385bc5b7304fa78aca81c4c