Apply naming recomendations from mailing list discussion: unsafe=>relaxed, safe=>strict