Fix some syntax/naming issues.

Good to know, thanks.