changed variable and type names