entitlement: integrate code review comments

Simple renaming, no functional change.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>