Fix interfaces and class names

(not tested)