- modified save action
- changed some namings