Fixed some misnamed variables and one instance of em

[apalfrey]

Could possibly cause some issues where those variables are being overwritten, however in the name of consistancy, it's a change for the best.