further consistency in naming / ocd
whip equiv into shape