Issue 3617 rename under host