jf: rename fixes