normalize variable names to make structure clearer