Refactor naming scheme