fixed rename issues
fixed rename issues