CB-8067 externalized valid-identifier it is it's own module