Refactor Naming strategy to allow only 1 global strategy