Better indentation for ModelHandlers
Added name canonicalization function