name change and rewrite