proctor-builder: Fix option lookups by using short name