rename, minor fixes