Don't mention implementation in variable name
Fix incorrect specifications