Name edit and param bug