swapped order of entity constructor arguments so that they make more sense