Rolled back name changes