Fix for variable perforce naming scheme

Fixes naming issue with newer Perforce versions.

https://reviews.reviewboard.org/r/5120
https://code.google.com/p/reviewboard/issues/detail?id=3169