Compiler:

 - Rename class names to differentiate from the ext version