added missing Base part in extension class names