Refactered Naming Convention