some renamings; better handling of provided methods