Refactered some names