Rename a few things in lang/, should affect no one.