Fix -name/-sname stuff