Fixed naming convention
Fixed some more naming convention