since we now have the full_code classes, I guess it makes sense to use
the full name for the old version.