Revert change to camelCase property names

commit 3312f9bc967c333e6c8cf6c6af76b9b8233f8fcf