Reverted name changes