Refactored shorthand back to full vendor