Change some IDs to Classes