updated variable names in types