Fix option lookups by using short name