Revisit the entire concept. Rename for better adoption. Extend test coverage - e.g. run the full TCK.