diff --git a/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py b/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py
index fa8d99d1f8..f3b444a22e 100644
--- a/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py
+++ b/neutron/db/migration/alembic_migrations/versions/2447ad0e9585_add_ipv6_mode_props.py
@@ -47,14 +47,16 @@ def upgrade(active_plugins=None, options=None):
     # https://bitbucket.org/zzzeek/alembic/issue/89
     context = op.get_context()
     if context.bind.dialect.name == 'postgresql':
-        op.execute("CREATE TYPE ipv6_modes AS ENUM ('%s', '%s', '%s')"
+        op.execute("CREATE TYPE ipv6_ra_modes AS ENUM ('%s', '%s', '%s')"
+                   % ('slaac', 'dhcpv6-stateful', 'dhcpv6-stateless'))
+        op.execute("CREATE TYPE ipv6_address_modes AS ENUM ('%s', '%s', '%s')"
                    % ('slaac', 'dhcpv6-stateful', 'dhcpv6-stateless'))
     op.add_column('subnets',
                   sa.Column('ipv6_ra_mode',
                             sa.Enum('slaac',
                                     'dhcpv6-stateful',
                                     'dhcpv6-stateless',
-                                    name='ipv6_modes'),
+                                    name='ipv6_ra_modes'),
                             nullable=True)
                   )
     op.add_column('subnets',
@@ -62,7 +64,7 @@ def upgrade(active_plugins=None, options=None):
                             sa.Enum('slaac',
                                     'dhcpv6-stateful',
                                     'dhcpv6-stateless',
-                                    name='ipv6_modes'),
+                                    name='ipv6_address_modes'),
                             nullable=True)
                   )
 
@@ -75,4 +77,5 @@ def downgrade(active_plugins=None, options=None):
     op.drop_column('subnets', 'ipv6_address_mode')
     context = op.get_context()
     if context.bind.dialect.name == 'postgresql':
-        op.execute('DROP TYPE ipv6_modes')
+        op.execute('DROP TYPE ipv6_ra_modes')
+        op.execute('DROP TYPE ipv6_address_modes')
diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py
index bbf9d64557..ab6ecfd1d0 100644
--- a/neutron/db/models_v2.py
+++ b/neutron/db/models_v2.py
@@ -185,11 +185,11 @@ class Subnet(model_base.BASEV2, HasId, HasTenant):
     ipv6_ra_mode = sa.Column(sa.Enum(constants.IPV6_SLAAC,
                                      constants.DHCPV6_STATEFUL,
                                      constants.DHCPV6_STATELESS,
-                                     name='ipv6_modes'), nullable=True)
+                                     name='ipv6_ra_modes'), nullable=True)
     ipv6_address_mode = sa.Column(sa.Enum(constants.IPV6_SLAAC,
                                   constants.DHCPV6_STATEFUL,
                                   constants.DHCPV6_STATELESS,
-                                  name='ipv6_modes'), nullable=True)
+                                  name='ipv6_address_modes'), nullable=True)
 
 
 class Network(model_base.BASEV2, HasId, HasTenant):