finish rename (split up for git)