naming compliance
fix error when renaming
Merge branch 'master' of W:/staff_by_team/Students_software/v0.1