Use NAME instead of hardcoded name 'fig' consistently