Naming change to make more sense