Fixes rename issues