Changed names to be more coherent