Changed names for more intuitive handling