some hopefully last renaming issues fixed