Changing names again, making proprietary to avoid errors.