Fix rename Entity