a couple of method/variable renamings