Rename to cpp and fix bug.