Fix documentation and variable names to be consistent / true