Fixed silly naming conventions