Replaced XXX_VERSION_NUMBER_XXX with XXX_VERSION_XXX