Fixed some variable mismatch names