s1715: rename again