Refactored variable names in set&get charm state