fixed inconsistent naming scheme