Changed naming to make more sense