edit: methods, rename some classes