made identifier names more consistent