Added support for non-standard rgw names