Rename Funcions Correct