Fix property names

Close #199