Yes, both are cladistically correct, but debatable on semantic/usage grounds.