Fix name and add mef comp