Renaming function almost done for editor