changing names to match paradime