Update and rename PunchCard to Card