Name changing fixes