Fix some syntax/naming issues.