Changed variables case to match API
Revert wrapper behavior to match API