Rename + small fix