renaming of some data class, policy and scripts
renaming of some data class, policy and scripts