Fix up variable names and types to be correct

Test Plan: jest