Fix naming convension