Changed names to more logic names