diff --git a/doc/reference.rst b/doc/reference.rst
index f84e7865bf782b5e7a2c94085a5e37d4fceb1c6a..f35af329b218925c3bf2452cd8208a2f16520ea6 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -396,6 +396,6 @@ following always works::
 Flags
 -----
 
-.. autoclass:: LoopyFlags
+.. autoclass:: Flags
 
 .. vim: tw=75:spell
diff --git a/loopy/__init__.py b/loopy/__init__.py
index 301fae4d0c113c6e063b10cd4412233cf4221b8a..78d630e790fd844045c67a98c8774057ad4bb367 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -71,7 +71,7 @@ from loopy.preprocess import (preprocess_kernel, realize_reduction,
 from loopy.schedule import generate_loop_schedules
 from loopy.codegen import generate_code
 from loopy.compiled import CompiledKernel
-from loopy.flags import LoopyFlags
+from loopy.flags import Flags
 from loopy.auto_test import auto_test_vs_ref
 
 __all__ = [
@@ -109,7 +109,7 @@ __all__ = [
 
         "auto_test_vs_ref",
 
-        "LoopyFlags",
+        "Flags",
 
         "make_kernel",
 
diff --git a/loopy/flags.py b/loopy/flags.py
index 2297aa54b08124582006aae5b9f849059316472b..58e6e0957f93592911b93263957066576db70f9f 100644
--- a/loopy/flags.py
+++ b/loopy/flags.py
@@ -27,7 +27,7 @@ from pytools import Record
 import re
 
 
-class LoopyFlags(Record):
+class Flags(Record):
     """
     .. rubric:: Code-generation flags
 
@@ -86,7 +86,7 @@ KEY_VAL_RE = re.compile("^([a-zA-Z0-9]+)=(.*)$")
 
 def make_flags(flags_arg):
     if flags_arg is None:
-        return LoopyFlags()
+        return Flags()
     elif isinstance(flags_arg, str):
         iflags_args = {}
         for key_val in flags_arg.split(","):
@@ -103,6 +103,6 @@ def make_flags(flags_arg):
             else:
                 iflags_args[key_val] = True
 
-        return LoopyFlags(**iflags_args)
-    elif not isinstance(flags_arg, LoopyFlags):
-        return LoopyFlags(**flags_arg)
+        return Flags(**iflags_args)
+    elif not isinstance(flags_arg, Flags):
+        return Flags(**flags_arg)
diff --git a/loopy/kernel/__init__.py b/loopy/kernel/__init__.py
index f6fdf06ec95890dba2b2835691f5b13b8f2227a4..67291e8f613b85c4f74e4f22164c0c7e7aa40629 100644
--- a/loopy/kernel/__init__.py
+++ b/loopy/kernel/__init__.py
@@ -136,7 +136,7 @@ class LoopKernel(Record):
     .. attribute:: isl_context
     .. attribute:: flags
 
-        An instance of :class:`loopy.LoopyFlags`
+        An instance of :class:`loopy.Flags`
     """
 
     # {{{ constructor
diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py
index 2405dd08ba8d7e033adbee53e201894fcefa87af..f3e1eb01dbe4bd78160fc84a789cb8fb51c1abfa 100644
--- a/loopy/kernel/creation.py
+++ b/loopy/kernel/creation.py
@@ -984,7 +984,7 @@ def make_kernel(device, domains, instructions, kernel_data=["..."], **kwargs):
         length 16.
     :arg silenced_warnings: a list (or semicolon-separated string) or warnings
         to silence
-    :arg flags: an instance of :class:`loopy.LoopyFlags` or an equivalent
+    :arg flags: an instance of :class:`loopy.Flags` or an equivalent
         string representation
     """