Changed Field Names per @mberg suggestion.
persist version change in all the necessary places