Fix AWS naming scheme