Fix stupid rename mess