A few small changes

Replace illegal names, optimize a copy to a move, and fix the TODO about std::make_unique.