Fixing last issues with rename