some renamimg and small extractions