diff --git a/CHANGES.rst b/CHANGES.rst
index fe2844c..50ecb8f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@
 - Dropped support for Python 3.6 and 3.7. Minimum supported Python
   version is now 3.8. [#330]
 
+- OBMAG and VEGAMAG are no longer interchangeable. [#331]
+
 1.1.1 (2021-11-18)
 ==================
 
diff --git a/docs/synphot/spectrum.rst b/docs/synphot/spectrum.rst
index 661aa70..43645a6 100644
--- a/docs/synphot/spectrum.rst
+++ b/docs/synphot/spectrum.rst
@@ -48,7 +48,7 @@ for flux conversion)::
     <Quantity [6.62607015e-24, 6.62607015e-23] FNU>
     >>> area = 45238.93416 * units.AREA  # HST
     >>> sp(wave, flux_unit=units.OBMAG, area=area)  # doctest: +FLOAT_CMP
-    <Quantity [-21.52438718,-21.52438718] OBMAG>
+    <Magnitude [-21.52438718,-21.52438718] mag(OB)>
 
 .. _synphot_reddening:
 
diff --git a/synphot/observation.py b/synphot/observation.py
index 97f8281..5514b0e 100644
--- a/synphot/observation.py
+++ b/synphot/observation.py
@@ -458,7 +458,7 @@ class Observation(BaseSourceSpectrum):
         if flux_unit == u.count or flux_unit_name == units.OBMAG.to_string():
             val = self.countrate(area, binned=False, wavelengths=wavelengths)
 
-            if flux_unit.decompose() == u.mag:
+            if flux_unit == units.OBMAG:
                 eff_stim = (-2.5 * np.log10(val.value)) * flux_unit
             else:
                 eff_stim = val
diff --git a/synphot/units.py b/synphot/units.py
index fc129ee..8dbc68f 100644
--- a/synphot/units.py
+++ b/synphot/units.py
@@ -1,9 +1,6 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """This module handles photometry units that are not in `astropy.units`."""
 
-# THIRD-PARTY
-import numpy as np
-
 # ASTROPY
 from astropy import constants as const
 from astropy import units as u
@@ -49,10 +46,10 @@ FLAM = u.def_unit(
 FNU = u.def_unit(
     'fnu', u.erg / (u.cm**2 * u.s * u.Hz),
     format={'generic': 'FNU', 'console': 'FNU'})
-OBMAG = u.def_unit(
-    'obmag', u.mag, format={'generic': 'OBMAG', 'console': 'OBMAG'})
-VEGAMAG = u.def_unit(
-    'vegamag', u.mag, format={'generic': 'VEGAMAG', 'console': 'VEGAMAG'})
+_u_ob = u.def_unit('OB')
+OBMAG = u.mag(_u_ob)
+_u_vega = u.def_unit('VEGA')
+VEGAMAG = u.mag(_u_vega)
 
 # Register with astropy units
 u.add_enabled_units([PHOTLAM, PHOTNU, FLAM, FNU, OBMAG, VEGAMAG])
@@ -109,20 +106,12 @@ def spectral_density_vega(wav, vegaflux):
         PHOTLAM, equivalencies=u.spectral_density(wav)).value
 
     def converter(x):
-        """Set nan/inf to -99 mag."""
-        val = -2.5 * np.log10(x / vega_photlam)
-        result = np.zeros(val.shape, dtype=np.float64) - 99
-        mask = np.isfinite(val)
-        if result.ndim > 0:
-            result[mask] = val[mask]
-        elif mask:
-            result = np.asarray(val)
-        return result
+        return x / vega_photlam
 
     def iconverter(x):
-        return vega_photlam * 10**(-0.4 * x)
+        return x * vega_photlam
 
-    return [(PHOTLAM, VEGAMAG, converter, iconverter)]
+    return [(PHOTLAM, VEGAMAG.physical_unit, converter, iconverter)]
 
 
 def spectral_density_count(wav, area):
@@ -156,14 +145,8 @@ def spectral_density_count(wav, area):
     def iconverter_count(x):
         return x / factor
 
-    def converter_obmag(x):
-        return -2.5 * np.log10(x * factor)
-
-    def iconverter_obmag(x):
-        return 10**(-0.4 * x) / factor
-
     return [(PHOTLAM, u.count, converter_count, iconverter_count),
-            (PHOTLAM, OBMAG, converter_obmag, iconverter_obmag)]
+            (PHOTLAM, OBMAG.physical_unit, converter_count, iconverter_count)]
 
 
 def convert_flux(wavelengths, fluxes, out_flux_unit, **kwargs):
@@ -348,6 +331,10 @@ def validate_unit(input_unit):
             output_unit = u.STmag
         elif input_unit_lowcase in ('abmag', 'mag(ab)'):
             output_unit = u.ABmag
+        elif input_unit_lowcase in ('obmag', 'mag(ob)'):
+            output_unit = OBMAG
+        elif input_unit_lowcase in ('vegamag', 'mag(vega)'):
+            output_unit = VEGAMAG
 
         else:
             try:  # astropy.units is case-sensitive

diff --git a/synphot/tests/test_units.py b/synphot/tests/test_units.py
index 95aef73..3ffb064 100644
--- a/synphot/tests/test_units.py
+++ b/synphot/tests/test_units.py
@@ -1,7 +1,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 """Test units.py module.
 
-.. note:: VEGAMAG conversion is tested in test_spectrum.py.
+.. note:: VEGAMAG conversion is tested in test_spectrum_source.py.
 
 .. note:: spectral_density_integrated is tested in astropy>=4.1.
 
@@ -13,6 +13,7 @@ import pytest
 
 # ASTROPY
 from astropy import units as u
+from astropy.tests.helper import assert_quantity_allclose
 
 # LOCAL
 from synphot import exceptions, units
@@ -176,3 +177,18 @@ def test_flux_conversion_exceptions():
         units.convert_flux(_wave, _flux_photlam, u.count, area=None)
     with pytest.raises(exceptions.SynphotError):
         units.convert_flux(_wave, _flux_obmag, units.PHOTLAM, area=None)
+
+
+def test_vegamag_obmag_calculations():
+    assert_quantity_allclose(
+        5 * units.VEGAMAG - 2.5 * units.VEGAMAG, u.Magnitude(2.5))
+    assert_quantity_allclose(
+        (5 * units.VEGAMAG - 2.5 * units.VEGAMAG).to(u.one), 0.1)
+
+    # Should not be interchangeable with astropy mag unit or with another
+    # custom mag unit, but error is only raised if .to(u.one) is called.
+    msg = 'subtract magnitudes so the unit got lost'
+    with pytest.raises(u.UnitConversionError, match=msg):
+        (5 * units.VEGAMAG - 2.5 * u.STmag).to(u.one)
+    with pytest.raises(u.UnitConversionError, match=msg):
+        5 * units.VEGAMAG - 2.5 * units.OBMAG.to(u.one)

Redefine VEGAMAG and OBMAG so astropy can tell them apart
https://github.com/spacetelescope/synphot_refactor/blob/e51d7605349eebea0921c7d72da674b0af7d6db9/synphot/units.py#L52-L55

As stated in https://github.com/astropy/astropy/pull/13158#discussion_r858962549 , the new `astropy.modeling.models.Schechter1D` takes magnitude as parameter but currently it cannot tell VEGAMAG and OBMAG apart. @mhvk advised the following:

<hr/>

[The] problem is that they now are both just aliases to `u.mag`, so the units system cannot know what to do. I think best might be to treat it a bit like ST and AB, and define units `VEGA` and `OB` - which both being units without a known number, and then define `VEGAMAG = u.mag(VEGA)` and `OBMAB = u.mag(OB)`. Then one can no longer just mix and match those magnitude systems:

```python
>>> from astropy import units as u
>>> VEGA = u.def_unit('VEGA')
>>> OB = u.def_unit('OB')
>>> VEGAMAG = u.mag(VEGA)
>>> OBMAG = u.mag(OB)
>>> (5 * VEGAMAG - 2.5 * VEGAMAG).to(u.one)
<Quantity 0.1>
>>> (5 * VEGAMAG - 2.5 * OBMAG).to(u.one)
UnitConversionError: ("'VEGA / OB' and '' (dimensionless) are not convertible",
'Did you perhaps subtract magnitudes so the unit got lost?')
```

Note that of course the user can still shoot themselves in the foot by forgetting what band a magnitude is in...

<hr/>

To go with this patch, relevant documentation and tests might also need updating. And this might be a breaking change, so should not be in a bugfix release.
synphot/tests/test_units.py::test_vegamag_obmag_calculations
synphot/tests/test_units.py::test_implicit_assumptions synphot/tests/test_units.py::test_validate_unit[angstroms-out_u0] synphot/tests/test_units.py::test_validate_unit[inversemicrons-out_u1] synphot/tests/test_units.py::test_validate_unit[transmission-out_u2] synphot/tests/test_units.py::test_validate_unit[TRANSMISSION-out_u3] synphot/tests/test_units.py::test_validate_unit[extinction-out_u4] synphot/tests/test_units.py::test_validate_unit[emissivity-out_u5] synphot/tests/test_units.py::test_validate_unit[photlam-out_u6] synphot/tests/test_units.py::test_validate_unit[photnu-out_u7] synphot/tests/test_units.py::test_validate_unit[flam-out_u8] synphot/tests/test_units.py::test_validate_unit[fnu-out_u9] synphot/tests/test_units.py::test_validate_unit[stmag-out_u10] synphot/tests/test_units.py::test_validate_unit[abmag-out_u11] synphot/tests/test_units.py::test_validate_unit[obmag-out_u12] synphot/tests/test_units.py::test_validate_unit[vegamag-out_u13] synphot/tests/test_units.py::test_validate_unit[Kelvin-out_u14] synphot/tests/test_units.py::test_validate_unit[in_u15-out_u15] synphot/tests/test_units.py::test_validate_wave_unit[angstroms-out_u0] synphot/tests/test_units.py::test_validate_wave_unit[inversemicrons-out_u1] synphot/tests/test_units.py::test_validate_wave_unit[Hz-out_u2] synphot/tests/test_units.py::test_validate_unit_exceptions synphot/tests/test_units.py::test_validate_quantity[100.0-out_u0-eqv0-100.0] synphot/tests/test_units.py::test_validate_quantity[in_val1-out_u1-eqv1-0.01] synphot/tests/test_units.py::test_validate_quantity[in_val2-out_u2-eqv2-ans2] synphot/tests/test_units.py::test_wave_conversion[in_q0-out_u0-ans0] synphot/tests/test_units.py::test_wave_conversion[in_q1-out_u1-ans1] synphot/tests/test_units.py::test_wave_conversion[in_q2-out_u2-ans2] synphot/tests/test_units.py::test_wave_conversion[in_q3-out_u3-ans3] synphot/tests/test_units.py::test_wave_conversion[in_q4-out_u4-ans4] synphot/tests/test_units.py::test_wave_conversion[in_q5-out_u5-ans5] synphot/tests/test_units.py::test_flux_conversion[in_q0-out_u0-ans0-True] synphot/tests/test_units.py::test_flux_conversion[in_q1-out_u1-ans1-False] synphot/tests/test_units.py::test_flux_conversion[in_q2-out_u2-ans2-False] synphot/tests/test_units.py::test_flux_conversion[in_q3-out_u3-ans3-False] synphot/tests/test_units.py::test_flux_conversion[in_q4-out_u4-ans4-False] synphot/tests/test_units.py::test_flux_conversion[in_q5-out_u5-ans5-False] synphot/tests/test_units.py::test_flux_conversion[in_q6-out_u6-ans6-False] synphot/tests/test_units.py::test_flux_conversion[in_q7-out_u7-ans7-True] synphot/tests/test_units.py::test_flux_conversion[in_q8-out_u8-ans8-True] synphot/tests/test_units.py::test_flux_conversion[in_q9-out_u9-ans9-True] synphot/tests/test_units.py::test_flux_conversion[in_q10-out_u10-ans10-True] synphot/tests/test_units.py::test_flux_conversion[in_q11-out_u11-ans11-True] synphot/tests/test_units.py::test_flux_conversion[in_q12-out_u12-ans12-True] synphot/tests/test_units.py::test_flux_conversion[in_q13-out_u13-ans13-True] synphot/tests/test_units.py::test_flux_conversion[in_q14-out_u14-ans14-True] synphot/tests/test_units.py::test_flux_conversion[in_q15-out_u15-ans15-True] synphot/tests/test_units.py::test_flux_conversion[in_q16-out_u16-ans16-True] synphot/tests/test_units.py::test_flux_conversion[in_q17-out_u17-ans17-True] synphot/tests/test_units.py::test_flux_conversion[in_q18-out_u18-ans18-True] synphot/tests/test_units.py::test_flux_conversion[in_q19-out_u19-ans19-True] synphot/tests/test_units.py::test_flux_conversion[in_q20-out_u20-ans20-True] synphot/tests/test_units.py::test_flux_conversion[in_q21-out_u21-ans21-True] synphot/tests/test_units.py::test_flux_conversion[in_q22-out_u22-ans22-True] synphot/tests/test_units.py::test_flux_conversion[in_q23-out_u23-ans23-True] synphot/tests/test_units.py::test_flux_conversion[in_q24-out_u24-ans24-True] synphot/tests/test_units.py::test_flux_conversion[in_q25-out_u25-ans25-True] synphot/tests/test_units.py::test_flux_conversion[in_q26-out_u26-ans26-True] synphot/tests/test_units.py::test_flux_conversion_exceptions