Further fixes from missing file rename.