Fixing temporary names