Consistency capitalisation of class names
Added missing properties