finish the implementer for rename type
minor changes