renames, minor fixes