Fixes AWS joiner classname

Fixes #4025