Changed names to be more descriptive