Changed names to clean slightly