Fix naming per review http://codereview.appspot.com/5375044/
2 files changed