Did some renaming. Fixed a minor issue with data saving.