Translation strategy refactor
Add ec2 naming strategy