[bug 1035319] Fixed req names and removed scripts.