Update naming pattern
Merge branch 'naming-update'