Change Property Name and coding style 

according to pull request dissuction