fixing rename problems.