Stub entities renamed

Changed classes names back from plural to singular