diff --git a/PerlTQt/examples/opengl/box/GLBox.pm b/PerlTQt/examples/opengl/box/GLBox.pm
index 1c6ceb8..99eae9c 100644
--- a/PerlTQt/examples/opengl/box/GLBox.pm
+++ b/PerlTQt/examples/opengl/box/GLBox.pm
@@ -75,7 +75,7 @@ sub makeObject
 
     glLineWidth( 2.0 );
 
-    glBegin( GL_TQUADS );
+    glBegin( GL_QUADS );
     glVertex3f(  1.0,  0.5, -0.4 );
     glVertex3f(  1.0, -0.5, -0.4 );
     glVertex3f( -1.0, -0.5, -0.4 );
@@ -84,7 +84,7 @@ sub makeObject
 
     qglColor( &blue );
 
-    glBegin( GL_TQUADS );
+    glBegin( GL_QUADS );
     glVertex3f(  1.0,  0.5, 0.4 );
     glVertex3f(  1.0, -0.5, 0.4 );
     glVertex3f( -1.0, -0.5, 0.4 );
@@ -93,7 +93,7 @@ sub makeObject
 
     qglColor( &darkRed );
 
-    glBegin( GL_TQUAD_STRIP );
+    glBegin( GL_QUAD_STRIP );
     glVertex3f(  1.0,  0.5, -0.4 );   glVertex3f(  1.0,  0.5, 0.4 );
     glVertex3f(  1.0, -0.5, -0.4 );   glVertex3f(  1.0, -0.5, 0.4 );
     qglColor( &yellow );
diff --git a/PerlTQt/examples/opengl/gear/gear b/PerlTQt/examples/opengl/gear/gear
index d9e4c8a..caec1a3 100644
--- a/PerlTQt/examples/opengl/gear/gear
+++ b/PerlTQt/examples/opengl/gear/gear
@@ -54,7 +54,7 @@ sub gear {
     glNormal3f(0.0, 0.0, 1.0);
 
     # draw front face
-    glBegin(GL_TQUAD_STRIP);
+    glBegin(GL_QUAD_STRIP);
     for $i (0 .. $teeth) {
 	$angle = $i * 2.0*$pi / $teeth;
         glVertex3f($r0*cos($angle), $r0*sin($angle), $width*0.5);
@@ -65,7 +65,7 @@ sub gear {
     glEnd();
 
     # draw front sides of teeth
-    glBegin(GL_TQUADS);
+    glBegin(GL_QUADS);
     $da = 2.0*$pi / $teeth / 4.0;
     for $i (0 .. $teeth-1) {
        $angle = $i * 2.0*$pi / $teeth;
@@ -81,7 +81,7 @@ sub gear {
     glNormal3f(0.0, 0.0, -1.0);
 
     # draw back face
-    glBegin(GL_TQUAD_STRIP);
+    glBegin(GL_QUAD_STRIP);
     for $i (0 .. $teeth) {
         $angle = $i * 2.0*$pi / $teeth;
         glVertex3f($r1*cos($angle), $r1*sin($angle), -$width*0.5);
@@ -92,7 +92,7 @@ sub gear {
     glEnd();
 
     # draw back sides of teeth
-    glBegin(GL_TQUADS);
+    glBegin(GL_QUADS);
     $da = 2.0*$pi / $teeth / 4.0;
     for $i (0 .. $teeth-1) {
         $angle = $i * 2.0*$pi / $teeth;
@@ -105,7 +105,7 @@ sub gear {
     glEnd();
 
     # draw outward faces of teeth
-    glBegin(GL_TQUAD_STRIP);
+    glBegin(GL_QUAD_STRIP);
     for $i (0 .. $teeth-1) {
         $angle = $i * 2.0*$pi / $teeth;
 
@@ -139,7 +139,7 @@ sub gear {
     glShadeModel(GL_SMOOTH);
 
     # draw inside radius cylinder
-    glBegin(GL_TQUAD_STRIP);
+    glBegin(GL_QUAD_STRIP);
     for $i (0 .. $teeth) {
         $angle = $i * 2.0*$pi / $teeth;
         glNormal3f(-cos($angle), -sin($angle), 0.0);
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 224ac09..058f7d8 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -23,7 +23,7 @@ use kdocParseDoc;
 use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $allow_k_dcop_accessors
         @includeclasses $includeclasses $skipInternal %defines $defines $match_qt_defines
 	$libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin
-	$Version $tquiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe
+	$Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe
 	%formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode 
 	@classStack $cNode $globalSpaceClassName
 	$lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded
@@ -52,7 +52,7 @@ $includeclasses = "";
 $doPrivate = 0;
 $Version = "0.9";
 
-$tquiet = 0;
+$quiet = 0;
 $debug = 0;
 $debuggen = 0;
 $parseonly = 0;
@@ -201,7 +201,7 @@ GetOptions( \%options,
 	"define=s", \%defines, # define a single preprocessing symbol
 	"defines=s", \$defines, # file containing preprocessing symbols, one per line
 
-	"tquiet|q",	\$tquiet,
+	"quiet|q",	\$quiet,
 	"debug|D",	\$debug, # debug the parsing
 	"debuggen",	\$debuggen, # debug the file generation
 	"parse-only",	\$parseonly )
@@ -221,7 +221,7 @@ else {
 if ($#includeclasses>=0)
 {
     $includeclasses = join (" ", @includeclasses);
-    print "Using Classes: $includeclasses\n" unless $tquiet;
+    print "Using Classes: $includeclasses\n" unless $quiet;
 }
 
 if ( $#includes >= 0 && !$cpp ) {
@@ -330,7 +330,7 @@ sub readLibraries
 
 	require kdocLib;
 	foreach my $lib ( @libs ) {
-		print "$exe: reading lib: $lib\n" unless $tquiet;
+		print "$exe: reading lib: $lib\n" unless $quiet;
 
 		my $relpath = exists $options{url} ? 
 			$options{url} : $outputdir;
@@ -366,7 +366,7 @@ sub parseFiles
 				|| croak "Can't read from $currentfile";
 		}
 
-		print STDERR "$exe: processing $currentfile\n" unless $tquiet;
+		print STDERR "$exe: processing $currentfile\n" unless $quiet;
 
 		# reset vars
 		$rootNode = getRoot( $lang );
@@ -415,7 +415,7 @@ sub writeDocumentation
 			require $pack.".pm";
 
 			print STDERR "Generating bindings for $format ",
-				          "language...\n" unless $tquiet;
+				          "language...\n" unless $quiet;
 
 			my $f = "$pack\::writeDoc";
 			&$f( $libname, $node, $outputdir, \%options );