Re-name classes