Name change fix