renamed some vars

For easier reading and understanding