Cleanup of subresource* variable names