Changed names to be more semantic