Make the naming consistent
Merge branch 'consistency_push'