Update to use eo-eb- prefix for classes