Fix name changing causing an error