Fix namespace typo.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed another typo.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixed invalid variable.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'