fix names

Fix classes names