Fix naming conventions