change name pattern to avoid move keyword