Fixed EC2 configuration namespace

See commit messages below.