Rename a few more constants