Improve the fix for #1

Instead of trimming the class names, just fix how they are written in the manifest.

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>