Fixed bug where old names stay