Fixed naming convention on properties