be consistent with resource namespacing

always name after the aws type name