Fixed broken-ness, by renaming Location -> Loc and StuffLocation -> StuffLoc