renamed classes to match stubornella ocss names and shortnames