Rename macros.
Use JD_SV.