fix names to match IDocument
rename functions