Fix naming convention