Issues #71 (script names) and #72 (language names)