Fix some naming and spacing in lib/util.php