Use the short name for bridgehead macro definitions that contain a class