renamings to improve readability