Improve rake rename task