fix class name
fix another class name
add missing user serializers