Fixed some issues with the name change