Update base class names
Fix return value identation