Merge "Deprecate resources_prefix and change rand_name()"