fixed few more naming inconsistencies