Renames
Script generator fixes.