rename consts
Merge branch 'develop'

1. rename consts