Rename EDA and finish it