Fixed issues with name change