Rename & fixes