Removing AWS version module namespacing