Fix naming conventions.