STATIC_IF_HAS_SHORT_NAMES added